[#2032] Update build system to buildbot changes.