NET-181: If admin_ip and admin_netmask are set in bootparams, don't use DHCP
OS-1244 vfsstat output is confusing
OS-2490 'imgadm update' should ensure imported images' snapshot is named '@final'
OS-1999 imgadm update on already installed image should re-fetch manifest for mutable field changes
OS-2520 add archive_on_delete option for VMs so that we can keep zone data around for debugging.
OS-2541 ignore failed VMs that are also stopped when checking for duplicate IP/MAC/VRID
OS-2565 add some additional debugging to try to help track down 'Could not find VM...' errors.
Merge branch 'master' of git://github.com/joyent/smartos-live into ec