Merge branch 'master' into origin-8019-crunchrun-log-throttle

diff --cc services/api/app/controllers/arvados/v1/schema_controller.rb
index 07a581f4c24f10e08e58949277b0318e1656261b,11269d2556a3b386c5f52edbaabda47629f6b769..e1f4ca5770403e1eb9164ed41d59e807ed1cc551
--- 1/services/api/app/controllers/arvados/v1/schema_controller.rb
--- 2/services/api/app/controllers/arvados/v1/schema_controller.rb
+++ b/services/api/app/controllers/arvados/v1/schema_controller.rb
@@@ -38,13 -38,7 +38,14 @@@ class Arvados::V1::SchemaController < A
          blobSignatureTtl: Rails.application.config.blob_signature_ttl,
          maxRequestSize: Rails.application.config.max_request_size,
          dockerImageFormats: Rails.application.config.docker_image_formats,
 +        crunchLogBytesPerEvent: Rails.application.config.crunch_log_bytes_per_event,
 +        crunchLogSecondsBetweenEvents: Rails.application.config.crunch_log_seconds_between_events,
 +        crunchLogThrottlePeriod: Rails.application.config.crunch_log_throttle_period,
 +        crunchLogThrottleBytes: Rails.application.config.crunch_log_throttle_bytes,
 +        crunchLogThrottleLines: Rails.application.config.crunch_log_throttle_lines,
 +        crunchLimitLogBytesPerJob: Rails.application.config.crunch_limit_log_bytes_per_job,
 +        crunchLogPartialLineThrottlePeriod: Rails.application.config.crunch_log_partial_line_throttle_period,
+         websocketUrl: Rails.application.config.websocket_address,
          parameters: {
            alt: {
              type: "string",

diff --cc services/api/config/application.default.yml
Simple merge

diff --cc services/crunch-run/crunchrun.go
Simple merge