Merge branch 'next' into fifteen

diff --cc config/rootfiles/common/apache2
index a1cd423c505400cde97608efde50f2f60f4e37c4,c18b5ed67658eb4691e46a8d74a1642a2279f315..4640fa4affd982a1d7cbd9a8a5653445c7b5c823
--- 1/config/rootfiles/common/apache2
--- 2/config/rootfiles/common/apache2
+++ b/config/rootfiles/common/apache2
@@@ -1388,13 -1388,12 +1388,14 @@@ srv/web/ipfire/cgi-bin/connscheduler.cg
  srv/web/ipfire/cgi-bin/country.cgi
  srv/web/ipfire/cgi-bin/credits.cgi
  srv/web/ipfire/cgi-bin/dns.cgi
+ srv/web/ipfire/cgi-bin/dnsforward.cgi
  srv/web/ipfire/cgi-bin/ddns.cgi
  srv/web/ipfire/cgi-bin/dhcp.cgi
 -srv/web/ipfire/cgi-bin/dmzholes.cgi
 +#srv/web/ipfire/cgi-bin/dmzholes.cgi
  srv/web/ipfire/cgi-bin/extrahd.cgi
  srv/web/ipfire/cgi-bin/fireinfo.cgi
 +srv/web/ipfire/cgi-bin/firewall.cgi
 +srv/web/ipfire/cgi-bin/fwhosts.cgi
  srv/web/ipfire/cgi-bin/gui.cgi
  srv/web/ipfire/cgi-bin/hardwaregraphs.cgi
  srv/web/ipfire/cgi-bin/hosts.cgi

diff --cc make.sh
Simple merge