Merge branch 'omniti-ms' of src.omniti.com:~omnios/core/omnios-build into omniti-ms
Merge branch 'omniti-ms' of github.com:omniti-labs/omnios-build into omniti-ms