Avoid killing apinger's rrdtool processes on kill_traffic_collector(). It helps a problem reported on comment of ticket #1399
Update usr/local/www/system_gateways_edit.php

Correct IP family mix-up.
Merge pull request #366 from bcyrill/patch-5

Correct IP family mix-up.
Merge remote-tracking branch 'upstream/master' into nas_accounting