Fixup for bug 860246 because of conflict with bug 789373. r=hwine
Merge branch 'master' of https://github.com/mozilla/build-buildbot-configs into b2g
fix path