Merge branch 'master' into 9307-cwl-use-tmp-output

Conflicts:
	sdk/cwl/tests/test_job.py

diff --cc sdk/cwl/arvados_cwl/arvjob.py
Simple merge

diff --cc sdk/cwl/tests/test_job.py
index db596ca7fa1621cef948e106299fa421a91685cd,8317c8f1fef09a499b2a350e1e61fdf84b2f7892..8d12aab7e2e6a931a3a92db17b587e5c3d8db036
--- 1/sdk/cwl/tests/test_job.py
--- 2/sdk/cwl/tests/test_job.py
+++ b/sdk/cwl/tests/test_job.py
@@@ -22,7 -22,8 +22,8 @@@ class TestJob(unittest.TestCase)
          runner = mock.MagicMock()
          runner.project_uuid = "zzzzz-8i9sb-zzzzzzzzzzzzzzz"
          runner.ignore_docker_for_reuse = False
 -        document_loader, avsc_names, schema_metadata, metaschema_loader = cwltool.process.get_schema("draft-3")
+         runner.num_retries = 0
 +        document_loader, avsc_names, schema_metadata, metaschema_loader = cwltool.process.get_schema("v1.0")
  
          tool = {
              "inputs": [],
@@@ -70,9 -71,9 +71,12 @@@
          runner = mock.MagicMock()
          runner.project_uuid = "zzzzz-8i9sb-zzzzzzzzzzzzzzz"
          runner.ignore_docker_for_reuse = False
 -        document_loader, avsc_names, schema_metadata, metaschema_loader = cwltool.process.get_schema("draft-3")
+         runner.num_retries = 0
 +        arvados_cwl.add_arv_hints()
++
 +        document_loader, avsc_names, schema_metadata, metaschema_loader = cwltool.process.get_schema("v1.0")
 +
+ 
          tool = {
              "inputs": [],
              "outputs": [],