OS-2249: ipv4-forwarding service always enabled
OS-2235 prstat -V swap summary is large compared to prstat -VZ
Merge branch 'master' of git://github.com/joyent/illumos-joyent into smartos/ec