Refactor builder setup#736

encukou wants to merge 2 commits into

python:mainpython/buildmaster-config:mainfrom

encukou:refactor-setup-iencukou/buildmaster-config:refactor-setup-iCopy head branch name to clipboard