Prefix $BUILDDIR with $USER
Merge branch 'r151006' of src.omniti.com:~omnios/core/omnios-build into r151006