Consolidate PR and regular worker setup#706

zware merged 3 commits into

python:mainpython/buildmaster-config:mainfrom

encukou:config-cleanup-consolidate-prencukou/buildmaster-config:config-cleanup-consolidate-prCopy head branch name to clipboard