refs #8625: add support for custom salt_puppetrun_cmd config parameter
Merge branches '8625-add_salt_puppetrun_cmd' and 'develop' into develop