unify slave and builder handling in brd tests
Merge branch 'buck-nine-yakshave-brd-tests' of git://github.com/bukzor/buildbot into nine