OS-2201 build_usb erroneously checks for mkisofs
Merge branch 'master' of git://github.com/joyent/smartos-live into ec