OS-1644 Update bge pci ids for OS-1366
OS-1649 fix handling of quota when sysinfo unavailable.
OS-1549 fix so vmadm stop; vmadm start works, add tests.
OS-1653 smartos-live needs to help strap along
OS-1654 0-livesrc-stamp should build with -zassert-deflib
OS-1614 pull in node-bunyan 0.14.6 which has some changes I made/need.
OS-1615 switch VM.js logging to bunyan
OS-1676: 'json -h' output has incorrect link to online man page
OS-1677 Add unmodified node-dtrace provider (0.2.2) db13b0aeafc1db58c756ee4d9ed65b808a6b700c and libusdt 8ab25b6e5d32afc9147890ba80b1e99a4102717e
OS-1677 Add Makefile sections for node-dtrace module.
OS-1680 update node-dtrace provider to 3336f6ebd2fc73c6cfd4d09be3d80a5716aace8d (0.2.3)
OS-1441 routing-setup service provides no useful log output (move method from illumos-joyent)
OS-1441 routing-setup service provides no useful log output
Revert "OS-1441 routing-setup service provides no useful log output (move method from illumos-joyent)"

This reverts commit 6687aad2cdfeabaec4f3d6a57931c0d3b805db36.

Conflicts:

	overlay/generic/lib/svc/method/net-routing-setup
smartos-live#114 imgadm should send Host header in HTTP requests
OS-1684 fix vmadm display of delegated dataset when mountpoint has been changed
OS-1633 add support for 'snapshots' listing in VM objects in VM.js
smartos-live#133 fixed issue deleting KVM VMs with snapshots (thanks calmh)
OS-717 apix code induces hangs
OS-1695 fix IP address of datasets.joyent.com now that old one was deleted.
OS-1628 tools/build_illumos should not pass -i
OS-1627 smartos-live ./configure needs some love