Merge production -> default
bug 1029704 - runner & buildbot init script mods; r=dustin
No bug: add ix1204-5.relabs; a=orgonly
Revert "bug 1029704 - runner & buildbot init script mods; r=dustin"
Merge default -> production

--HG--
branch : production