Bug 842868, buildbot changes for beta -> release merge, r=rail