Revert "Bug 999564: don't install the builder user everywhere just to clean its appstate; r=Callek"
Merge default -> production