Consolidate PR and regular worker setup#706

encukou wants to merge 2 commits intopython:mainpython/buildmaster-config:mainfrom

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