More intelligent handling of CronJob lock failures.
Merge branch 'master' into staging