Merge buildbot script changes