Bug 986599: upgrade CentOS to Puppet-3.6.1; r=rail
Merge default -> production

--HG--
branch : production