Bug 971812: new nodes for new masters
Merge commit

--HG--
branch : production