Bug 1019013 - pin slaves to mphillips environment; a=nodechange
merge default -> production

--HG--
branch : production