Updated sample jobs with embedded scenario
Refactored puppet version support
Improved error handling