15954: Merge branch 'master'

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@tomclegg.ca>

diff --cc build/run-tests.sh
Simple merge

diff --cc lib/config/config.default.yml
Simple merge

diff --cc lib/config/generated_config.go
Simple merge

diff --cc sdk/python/tests/run_test_server.py
index e1ccca3ecf697d51506167623a456dcbcb4c8f60,f5528081f46b933c8821a8accaba9ae699803186..262b9d2a2cbc7f0925867e9a522b8402e0386bd2
--- 1/sdk/python/tests/run_test_server.py
--- 2/sdk/python/tests/run_test_server.py
+++ b/sdk/python/tests/run_test_server.py
@@@ -755,18 -737,11 +755,18 @@@ def setup_config()
                  },
                  "Collections": {
                      "BlobSigningKey": "zfhgfenhffzltr9dixws36j1yhksjoll2grmku38mi7yxd66h5j4q9w4jzanezacp8s6q0ro3hxakfye02152hncy6zml2ed0uc",
-                     "TrustAllContent": True,
+                     "TrustAllContent": False,
                      "ForwardSlashNameSubstitution": "/",
 +                    "TrashSweepInterval": "-1s",
                  },
                  "Git": {
 -                    "Repositories": "%s/test" % os.path.join(SERVICES_SRC_DIR, 'api', 'tmp', 'git'),
 +                    "Repositories": os.path.join(SERVICES_SRC_DIR, 'api', 'tmp', 'git', 'test'),
 +                },
 +                "Containers": {
 +                    "JobsAPI": {
 +                        "GitInternalDir": os.path.join(SERVICES_SRC_DIR, 'api', 'tmp', 'internal.git'),
 +                    },
 +                    "SupportedDockerImageFormats": {"v1": {}},
                  },
                  "Volumes": {
                      "zzzzz-nyw5e-%015d"%n: {