Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next

diff --combined config/rootfiles/core/next/filelists/files
index 516c72a18e303c3655e5e919232028de9434ccb4,18df10798be0f701366399dfbb99cd5f6476edd5..d6455137ffc112ee28a1d1b3203b36db6e794914
--- 1/config/rootfiles/core/next/filelists/files
--- 2/config/rootfiles/core/next/filelists/files
+++ b/config/rootfiles/core/next/filelists/files
@@@ -1,8 -1,11 +1,12 @@@
 +etc/sysctl.conf
  etc/system-release
  etc/issue
  srv/web/ipfire/cgi-bin/extrahd.cgi
+ srv/web/ipfire/cgi-bin/index.cgi
+ srv/web/ipfire/cgi-bin/vpnmain.cgi
  var/ipfire/langs/de.pl
  var/ipfire/langs/en.pl
  var/ipfire/langs/es.pl
  var/ipfire/langs/fr.pl
+ usr/local/bin/ipsecctrl
+ usr/local/bin/vpn-watch