Fixing v2 cron cartridges and cleaning it up based upon peer review

[merge]