Make PKGSRVR and PKGPUBLISHER conditional settings
Merge branch 'omniti-ms' of src.omniti.com:~omnios/core/omnios-build into omniti-ms
hwloc (Portable Hardware Locality)