SmartOS/live 96e617c — overlay/generic/usr/share/bhyve uefi-csm-rom.bin, src/vm/etc vmadm.completion
Merge branch 'master' into vminfod Conflicts: src/vm/node_modules/vmload/index.js src/vm/node_modules/vmload/vmload-zoneadm.js src/vm/tests/test-defaults.js src/vm/tests/test-send-recv.js