Revert previous, breaks USERGROUP_PHASE=configure.

Even though pbulk does a 'make clean' for that case, the problem is that
we already created /home/pbulk/build as root.  If we still hit
permission errors, we should diagnose and fix them.
Merge branch 'joyent/feature/miscfix/2013Q2' into joyent/release/2013Q2