Bug 959404: give up and fake success after a few failed puppet runs, if not too long since success
Merge default -> production

--HG--
branch : production