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.
Merge branch 'master' of git://github.com/joyent/smartos-live into ec