Bug 773769: remove old puppetmaster, prepare to image hp1 with CentOS 6.5
Merge default -> production

--HG--
branch : production