OS-2263: 'man vmadm' PROPERTIES section doesn't mention "firewall_enabled" prop/field
TOOLS-184: fix intermittent net failures in VM test suite
Merge branch 'master' of git://github.com/joyent/smartos-live into ec