Load if_stf module if has not been done
Use the better -Fs modifies to pf to kill the states by interface. Also kill both sides on an interface when -k needs to be used
Allow clear package lock when 1st install fails

I upgraded a system this morning. An issue during the 1st package reinstall caused the package lock to be set, but no packages installed. The Backup/Restore GUI page did not show the section for resetting the package lock, because it only displays that if there is at least 1 package installed - catch-22.
This fixes that odd condition.
Display only needed Reinstall and Clear Package Lock buttons

Make the code a bit smarter, so the user only sees whichever of the reinstall and clear package lock buttons that are actually relevant.
Removed unused block of code
Merge pull request #365 from phil-davis/master

Allow clear package lock when 1st install fails
Hide usbus# from interfaces list. Fixes #2306
Avoid duplicate hw.usb_no_pf entry on loader.conf
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.
Add hw.usb.no_pf="1" to loader.conf on nanobsd
Merge pull request #367 from bcyrill/patch-8

Add hw.usb.no_pf="1" to loader.conf on nanobsd