Merge branch 'master' into 10081-cwl-run-same-job

Conflicts:
	sdk/cwl/arvados_cwl/runner.py

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

diff --cc sdk/cwl/arvados_cwl/runner.py
index 2e52b63ed695d36b9e9d28efc49547c9875e6c53,bdd80771ff224392516fc216a6e25d0248f3c211..cf2f1db997b9db9688b52258994bc6179863783d
--- 1/sdk/cwl/arvados_cwl/runner.py
--- 2/sdk/cwl/arvados_cwl/runner.py
+++ b/sdk/cwl/arvados_cwl/runner.py
@@@ -87,8 -80,8 +80,8 @@@ def upload_dependencies(arvrunner, name
                             name=name)
  
      def setloc(p):
-         if not p["location"].startswith("keep:"):
-             p["location"] = mapper.mapper(p["location"]).resolved
 -        if not p["location"].startswith("_:"):
++        if not p["location"].startswith("_:") and not p["location"].startswith("keep:"):
+             p["location"] = mapper.mapper(p["location"]).target
      adjustFileObjs(workflowobj, setloc)
      adjustDirObjs(workflowobj, setloc)
  

diff --cc sdk/cwl/setup.py
Simple merge