Merge branch 'master' into 9766-register-workflow

Conflicts:
	build/run-build-packages.sh
	sdk/cwl/setup.py
	sdk/cwl/tests/test_job.py

diff --cc sdk/cwl/tests/test_container.py
index 6b5c32163ed6901b74ae67d6386cca2f5c1f8f0e,7dd14a0eb7e8358eeecbf54da0665bd4af512790..7d941cf8fc7c5d5f1caf04d5b60a8aa2b67c1019
--- 1/sdk/cwl/tests/test_container.py
--- 2/sdk/cwl/tests/test_container.py
+++ b/sdk/cwl/tests/test_container.py
@@@ -5,8 -5,9 +5,10 @@@ import unittes
  import os
  import functools
  import cwltool.process
 +from schema_salad.ref_resolver import Loader
  
+ from schema_salad.ref_resolver import Loader
+ 
  if not os.getenv('ARVADOS_DEBUG'):
      logging.getLogger('arvados.cwl-runner').setLevel(logging.WARN)
      logging.getLogger('arvados.arv-run').setLevel(logging.WARN)

diff --cc sdk/cwl/tests/test_job.py
index 50c4e34b92facabb81008809c5bfe674760fde36,19ae93af25c2a057b761ed2c2ac2a7b97e46ce58..6189a2de351ff44b1d08d8937ca632eef390656a
--- 1/sdk/cwl/tests/test_job.py
--- 2/sdk/cwl/tests/test_job.py
+++ b/sdk/cwl/tests/test_job.py
@@@ -5,8 -5,9 +5,10 @@@ import unittes
  import os
  import functools
  import cwltool.process
 +from schema_salad.ref_resolver import Loader
  
+ from schema_salad.ref_resolver import Loader
+ 
  if not os.getenv('ARVADOS_DEBUG'):
      logging.getLogger('arvados.cwl-runner').setLevel(logging.WARN)
      logging.getLogger('arvados.arv-run').setLevel(logging.WARN)