OS-2548 want emergency workaround for OS-1828
OS-2548 want emergency workaround for OS-1828 (fix other targets)
Merge branch 'master' of git://github.com/joyent/illumos-extra into ec