bug 821445 - cleanup setup-master.py (ateam+addon masters). r=callek