Bug 1048231: reload puppetmasters' httpd on hg updates; r=Callek
Merge default -> production

--HG--
branch : production