Bug 946872: upgrade puppet on OS X; r=Callek
Merge default -> production

--HG--
branch : production