Bug 1058225: re-expand buildbot-master flows