Bug 1036382: remove releng-puppet2.build.scl1; r=arr
Bug 1037104: clean up logged deploy passwords; r=markco
Merge default -> production

--HG--
branch : production