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