bug 982096: remove old, now unused balrog credentials from BuildSlaves.py. r=dustin
Bug 979428: add relabs-puppet* to known_hosts; a=orgonly
Merge default -> production

--HG--
branch : production