Merge branch 'master' into 14539-pysdk-empty-dir

Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <ldipentima@veritasgenetics.com>

diff --combined build/run-tests.sh
index 50c578269d007bfa3c4e4533bd57e0c3318ac166,cb44372566f8eb36ec6163f9108c97e464d6fca8..c81376404cfae23224cca9d828527ebd3a2e3a61
--- 1/build/run-tests.sh
--- 2/build/run-tests.sh
+++ b/build/run-tests.sh
@@@ -37,7 -37,7 +37,7 @@@ CONFIGSRC=path Dir with api server conf
                 (If none given, leave config files alone in source tree.)
  services/api_test="TEST=test/functional/arvados/v1/collections_controller_test.rb"
                 Restrict apiserver tests to the given file
 -sdk/python_test="--test-suite test.test_keep_locator"
 +sdk/python_test="--test-suite tests.test_keep_locator"
                 Restrict Python SDK tests to the given class
  apps/workbench_test="TEST=test/integration/pipeline_instances_test.rb"
                 Restrict Workbench tests to the given file
@@@ -77,6 -77,10 +77,10 @@@ lib/cm
  lib/controller
  lib/crunchstat
  lib/dispatchcloud
+ lib/dispatchcloud/container
+ lib/dispatchcloud/scheduler
+ lib/dispatchcloud/ssh_executor
+ lib/dispatchcloud/worker
  services/api
  services/arv-git-httpd
  services/crunchstat
@@@ -926,6 -930,10 +930,10 @@@ gostuff=
      lib/controller
      lib/crunchstat
      lib/dispatchcloud
+     lib/dispatchcloud/container
+     lib/dispatchcloud/scheduler
+     lib/dispatchcloud/ssh_executor
+     lib/dispatchcloud/worker
      sdk/go/arvados
      sdk/go/arvadosclient
      sdk/go/auth