Buildbot nightly merge fixes

These are changes and merge errors that I found while checking the merge of master in buildbot-nightly (b5341fe9).

@rexissimus please check whether these make sense, you know more about these than I do