OS-1103 perform upgrade for old VMs to bring to {v: 1}
OS-1963 / smartos-live#135 fix vmadm recv for KVM VMs (thanks MerlinDMC!).
Merge branch 'master' of git://github.com/joyent/smartos-live into ec