buildbot: decouple smoketest from x86 builder
buildbot: move branches setting where it belongs
buildbot: simplify port settings