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

diff --cc config/rootfiles/core/139/filelists/files
index 8557affaa53c72392731eb1d77177fccbcb91449,a08d12e20c1c18fec95c85f09d1346edf4571bea..7a05c13fe6385df7b92bdd131e106d29c55474e9
--- 1/config/rootfiles/core/139/filelists/files
--- 2/config/rootfiles/core/139/filelists/files
+++ b/config/rootfiles/core/139/filelists/files
@@@ -5,15 -5,12 +5,16 @@@ var/ipfire/lang
  etc/httpd/conf/vhosts.d/ipfire-interface.conf
  etc/httpd/conf/vhosts.d/ipfire-interface-ssl.conf
  etc/rc.d/init.d/functions
+ etc/rc.d/init.d/networking/dhcpcd.exe
  etc/rc.d/init.d/networking/red
  etc/rc.d/init.d/networking/functions.network
 +etc/rc.d/init.d/networking/red.down/99-beep
  etc/rc.d/init.d/networking/red.up/23-suricata
 +etc/rc.d/init.d/networking/red.up/99-beep
  etc/rc.d/init.d/unbound
  etc/suricata/suricata.yaml
 +etc/ppp/ip-down
 +etc/ppp/ip-up
  srv/web/ipfire/cgi-bin/captive.cgi
  srv/web/ipfire/cgi-bin/ids.cgi
  srv/web/ipfire/cgi-bin/mail.cgi