smartos-live#238 Global zone lacks svc:/network/nfs/mapid:default
OS-2288 there is no dialup, only zuul
1986 libima misuses gethostname
Reviewed by: David Höppner <0xffea@gmail.com>
Reviewed by: Andy Stormont <andyjstormont@gmail.com>
Reviewed by: Jason King <jason.brian.king@gmail.com>
Reviewed by: Dan McDonald <danmcd@nexenta.com>
Approved by: Richard Lowe <richlowe@richlowe.net>
	[illumos-gate merge]

commit 5d539a8e4ead06ddda1d7f0274efee3d06c20e22
    1986 libima misuses gethostname
Merge branch 'master' of git://github.com/joyent/illumos-joyent into smartos/ec