Revert "Bug 946872: Upgrade facter and puppet on CentOS; r=Callek"
Merge default -> production

--HG--
branch : production