add changes from master for conflict resolution
add changes from master for conflict resolution

common-workflow-language/cwltool,dleehr/cwltool,common-workflow-language/cwltool,dleehr/cwltool,dleehr/cwltool,dleehr/cwltool,common-workflow-language/cwltool