buildbot scripts: fix inclusion of 3rd party tests, fix mixup with build names