DSC-443: Fixed defects in naming upload files as well as uploading with comasters (in both manual and auto workflows)
Merge branch 'master' into nn-dsc-443
Merge pull request #615 from nla/nn-dsc-443

dsc 443