Revert "Revert "Merge pull request #814 from NREL/53230709_MergeUserScriptJobs""

This reverts commit 400b874b956fd3c15d5256a8564f16932d3555cd.