Merge branch 'master' into core119

diff --combined config/rootfiles/core/120/filelists/files
index 8648cfccb10a2c0fa1cdc0f32bffab109edef5dc,d98e3a9180bfc94cc4e15135aa95e21fc45234fa..c029cd4308ba186776c984173c0f3a386f0390fe
--- 1/config/rootfiles/core/120/filelists/files
--- 2/config/rootfiles/core/120/filelists/files
+++ b/config/rootfiles/core/120/filelists/files
@@@ -7,8 -7,8 +7,9 @@@ etc/rc.d/init.d/pakfir
  etc/rc.d/init.d/unbound
  etc/rc.d/rcsysinit.d/S81pakfire
  opt/pakfire/lib/functions.pl
- opt/pakfire/pakfire.key
 +opt/pakfire/pakfire
+ opt/pakfire/pakfire-2007.key
+ opt/pakfire/pakfire-2018.key
  srv/web/ipfire/cgi-bin/ovpnmain.cgi
  srv/web/ipfire/cgi-bin/proxy.cgi
  srv/web/ipfire/cgi-bin/qos.cgi