FWAPI-68: fwadm: want to be able to find VMs affected by a rule
joyent/smartos-live#239: nictagadm doesn't properly handle comments in config file
OS-2387 Bump DEFAULT_MAXPID to 99999
FWAPI-71: "fwadm vms" throws an error when rule references an unknown VM
Merge branch 'master' of git://github.com/joyent/smartos-live into ec

Conflicts:
	overlay/generic/etc/system