Added support for newer Puppet
fixing option name
Reverting option name, adding minutes since last run
Merge branch 'puppet_issues'