Fixes for joyent/smartos-live#169 joyent/smartos-live#377 joyent/smartos-live#378

This is now safe thanks to the closing of OS-3634 and OS-3635.