Bug 976415: Make sure instance metadata has the right perms. r=rail
Bug 979428: make relabs-puppet2 the only puppet master
Merge default -> production

--HG--
branch : production