OS-2284 fix vmadm deletion of non-existent VM
Merge branch 'master' of git://github.com/joyent/smartos-live into ec