OS-2173 libmakestate shenanigans are janky
Merge branch 'master' of git://github.com/joyent/illumos-extra into ec