OS-2350 zoneadmd stuck in sdev
OS-2341 need a way to disable hsfs use in a zone
Merge branch 'master' of git://github.com/joyent/illumos-joyent into smartos/ec