Merge pull request #2401 from danmcp/master

Merged by openshift-bot
cron cleanup