Bug 1019013 - pin slaves to mphillips environment; a=nodechange
merge default -> production
Revert "Bug 1096734: add debugging info; r=Callek (irc)"
Merge default -> production