Bug 946872: pin puppet-server version, too; a=bustage
Merge default -> production

--HG--
branch : production