Merge branch 'master' of github.com:common-workflow-language/common-workflow-language

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

Author: Peter Amstutz

draft-4/conformance_test_draft-4.yaml

@@ -64,7 +64,6 @@
       class: File
       checksum: sha1$47a013e660d408619d894b20806b1d5086aab03b
       location:
-      path: Any
       size: 13
   doc: Test command execution in Docker with simplified syntax stdout redirection
 
@@ -79,40 +78,24 @@
   doc: Test command execution in Docker with stdout redirection
 
 - job:
-  output: {
-    "output_file": {
-        "checksum": "sha1$cec7b8746a78c42060c96505887449bca0142976",
-        "size": 84,
-        "location": "error.txt",
-        "class": "File"
-    }
-  }
   tool: draft-4/egrep-stderr.cwl
   doc: Test command line with stderr redirection
   output:
     output_file:
       class: File
       checksum: sha1$cec7b8746a78c42060c96505887449bca0142976
       size: 84
-      path: error.txt
+      location: error.txt
 
 - job:
-  output: {
-    "output_file": {
-        "checksum": "sha1$cec7b8746a78c42060c96505887449bca0142976",
-        "size": 84,
-        "location": "",
-        "class": "File"
-    }
-  }
   tool: draft-4/egrep-stderr-shortcut.cwl
   doc: Test command line with stderr redirection, brief syntax
   output:
     output_file:
       class: File
       checksum: sha1$cec7b8746a78c42060c96505887449bca0142976
       size: 84
-      path: Any
+      location: Any
 
 - output:
     output_file:

draft-4/draft-4/scatter-valuefrom-wf5.cwl

@@ -1,5 +1,5 @@
 #!/usr/bin/env cwl-runner
-cwlVersion: cwl:draft-4.dev2
+cwlVersion: cwl:draft-4.dev3
 class: Workflow
 inputs:
   inp: