[FIXED JENKINS-24914] Don't block indefinitely every other month
Merge pull request #1421 from daniel-beck/JENKINS-24914

[FIXED JENKINS-24914] Don't block indefinitely every other month