SMF Fixes (SmartOS / Solaris) 0.17 backport