Bug 997729: check puppetmaster certificates via nagios; r=dividehex
Bug 942262: remove non-functional SuperMicro IPMI upgrades; r=arr
Merge default -> production

--HG--
branch : production