buildbot: slightly simplify config creation
docker: make smoketest.sh executable
docker: use x86 instead of x86_64 for smoketest
buildbot: run smoketest for master and for-14.07 branches