Bug 986599: upgrade OS X to puppet-3.6.0; r=rail
Merge default -> production

--HG--
branch : production