Merge branch 'master' into fifteen

diff --combined config/rootfiles/oldcore/73/filelists/files
index 6df851ef0cd2ea542dd7451baa4eb5e4ee4b9321,8ddb96476d7445fae0ad2028268876a633cd3e1c..8ddb96476d7445fae0ad2028268876a633cd3e1c
--- 1/config/rootfiles/oldcore/73/filelists/files
--- 2/config/rootfiles/core/73/filelists/files
+++ b/config/rootfiles/oldcore/73/filelists/files
@@@ -3,9 -3,11 +3,11 @@@ etc/issu
  etc/rc.d/init.d/dnsmasq
  etc/rc.d/init.d/squid
  srv/web/ipfire/cgi-bin/logs.cgi/proxylog.dat
+ srv/web/ipfire/cgi-bin/netinternal.cgi
  srv/web/ipfire/cgi-bin/proxy.cgi
  srv/web/ipfire/cgi-bin/routing.cgi
  srv/web/ipfire/cgi-bin/wirelessclient.cgi
+ srv/web/ipfire/cgi-bin/vpnmain.cgi
  srv/web/ipfire/html/redirect.cgi
  srv/web/ipfire/html/redirect-templates/
  var/ipfire/header.pl