15003: Merge branch 'master' into 15003-preprocess-config

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg@veritasgenetics.com>

diff --combined services/api/config/arvados_config.rb
index cb76b68dc984e71155a0ebcc2bfaf7363a60d638,841ec4cca312ceb835ffc2a3721b25634ec52345..c114bb95a3eec80aa49af7a7990cdb839ebdffaa
--- 1/services/api/config/arvados_config.rb
--- 2/services/api/config/arvados_config.rb
+++ b/services/api/config/arvados_config.rb
@@@ -107,7 -107,7 +107,7 @@@ arvcfg.declare_config "Collections.Pres
  arvcfg.declare_config "Collections.TrashSweepInterval", ActiveSupport::Duration, :trash_sweep_interval
  arvcfg.declare_config "Collections.BlobSigningKey", NonemptyString, :blob_signing_key
  arvcfg.declare_config "Collections.BlobSigningTTL", Integer, :blob_signature_ttl
- arvcfg.declare_config "Collections.BlobSigning", Boolean, :permit_create_collection_with_unsigned_manifest
+ arvcfg.declare_config "Collections.BlobSigning", Boolean, :permit_create_collection_with_unsigned_manifest, ->(cfg, k, v) { ConfigLoader.set_cfg cfg, "Collections.BlobSigning", !v }
  arvcfg.declare_config "Containers.SupportedDockerImageFormats", Array, :docker_image_formats
  arvcfg.declare_config "Containers.LogReuseDecisions", Boolean, :log_reuse_decisions
  arvcfg.declare_config "Containers.DefaultKeepCacheRAM", Integer, :container_default_keep_cache_ram
@@@ -172,7 -172,7 +172,7 @@@ dbcfg = ConfigLoader.ne
  
  dbcfg.declare_config "PostgreSQL.ConnectionPool", Integer, :pool
  dbcfg.declare_config "PostgreSQL.Connection.Host", String, :host
 -dbcfg.declare_config "PostgreSQL.Connection.Port", Integer, :port
 +dbcfg.declare_config "PostgreSQL.Connection.Port", String, :port
  dbcfg.declare_config "PostgreSQL.Connection.User", String, :username
  dbcfg.declare_config "PostgreSQL.Connection.Password", String, :password
  dbcfg.declare_config "PostgreSQL.Connection.DBName", String, :database