OS-2261 / smartos-live#219 fix KVM autoboot after reboot
Merge branch 'master' of git://github.com/joyent/smartos-live into ec