OS-2172: imgadm + source URL with hostname + GZ DNS changes + internal DNS as first resolve.conf entry = broken
OS-2172: fix typo causing undeclared var
Merge branch 'master' of git://github.com/joyent/smartos-live into ec