OS-2297: Add allowed_ips to vmadm man page
OS-2307 '/lib/sdc/config.sh -json' should be fast when config hasn't changed
OS-1950: Need log rotation on /var/log/fw files
HEAD-678: Need persistent IPF rules functionality in Headnode
IMGAPI-95: imgadm create & imgadm publish (for non-KVM images and VMs)
OS-2324 "mdata-get sdc:datacenter_name" returns no value
OS-2314 fix path for metadata socket in zoneinit's 00-mdata.sh, and also fix to using correct mdata:fetch start method so we have correct path there too.
OS-2315 imgadm fails on images.joyent.com with SSL certificate failure
OS-2325 Revert imgadm changes exacerbatting this bug

'imgadm import ...' would frequently (always?) hang before this.

This reverts:
* c64ef5b - OS-2315 imgadm fails on images.joyent.com wit
* 0023a4e - IMGAPI-95: imgadm create & imgadm publish (for non-KVM images and VMs)
OS-2332 filewait needs to wait if file's parent directory does not exist when we start watching.
OS-2344 configure should accept no for ILLUMOS_ENABLE_DEBUG
OS-2268 smartos-live configure misses some default packages
NET-217: 4-space indents
FWAPI-59: fwadm get should only output JSON
OS-2346: vmadm crash on us-east-3 during update
OS-2284 fix vmadm deletion of non-existent VM
OS-2349 /etc/profile executes /usr/sbin/quota, which is O(mountpoints)
IMGAPI-95: imgadm create & imgadm publish (for non-KVM images and VMs)

This reverts commit 374414f229a2fe6e7c767d19636bd6eeae37317e, which
reverted the original add due to OS-2323.
OS-2323 hang in 'imgadm import ... IMAGE-UUID'
Merge remote-tracking branch 'joyent/master'