3600 edit(1) is a bad .so reference (fix merge cruft)
OS-2456 sd timeout/retry settings are absurd
OS-2457 mptsas timeout subsystem needs finer granularity
OS-2482 add support for sdc:operator-script which will pull from internal_metadata[operator-script]
OS-2485 configure is missing pkg_alternatives
OS-2400: occassional 'HashUpdate fail' in 'imgadm create ...'

The problem was the usage of the 'exit' event: you can get 'data'
events after that. That resulted in the HashUpdate error... *and*
two `next` calls. Correct answer is the 'close' event, which will
be after all 'data' events.
OS-2491 fix race condition between zfs set {compression,refreservation} and zfs list in VM.js
OS-2489: imgadm create must fail on 'zfs send' error
'make check'
ZAPI-404 add tests to ensure snapshots working w/ SNGL
OS-2488 incremental imgadm create should bork if no @final snapshot on the origin image
FWAPI-75: fwadm: list remote VMs

FWAPI-82: fwadm: want --owner_uuid option
fwadm now outputs which remote VMs were added or updated.
Merge branch 'master' of git://github.com/joyent/smartos-live into ec