Fixed the workflow "overhaul"...
refs  #2120, #2119
Merge pull request #2128 from cmfcmf/workflow-fixes

Fixed the workflow "overhaul"