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