Backport from trunk: deleted reference to buildbot3
Backport from trunk: deleted reference to buildbot3
Contentless merge from 5.2