Merge branch 'master' into 13306-arvados-cwl-runner-py3-support

Arvados-DCO-1.1-Signed-off-by:  Eric Biagiotti <ebiagiotti@veritasgenetics.com>

diff --combined build/run-tests.sh
index 87dfb9ab6fef63015ad7385b85c049180eaed991,749075d81576242a29db0d1b075414dc5f1d0270..7438ee6489b6ced5afc656a923e9720fc26dda58
--- 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
@@@ -76,6 -76,7 +76,7 @@@ lib/cl
  lib/cmd
  lib/controller
  lib/crunchstat
+ lib/cloud
  lib/dispatchcloud
  lib/dispatchcloud/container
  lib/dispatchcloud/scheduler
@@@ -595,7 -596,6 +596,7 @@@ pythonstuff=
      sdk/python
      sdk/python:py3
      sdk/cwl
 +    sdk/cwl:py3
      services/dockercleaner:py3
      services/fuse
      services/nodemanager
@@@ -930,6 -930,7 +931,7 @@@ gostuff=
      lib/cmd
      lib/controller
      lib/crunchstat
+     lib/cloud
      lib/dispatchcloud
      lib/dispatchcloud/container
      lib/dispatchcloud/scheduler