Merge branch 'master' into next

diff --combined config/rootfiles/core/96/exclude
index fe5e6a52eae241918ad5aebbdfae405bf97b9aaa,d87f175b5f1f8c4a93a80b64c3cc7fcab0ae3064..d87f175b5f1f8c4a93a80b64c3cc7fcab0ae3064
--- 1/config/rootfiles/core/96/exclude
--- 2/config/rootfiles/core/95/exclude
+++ b/config/rootfiles/core/96/exclude
@@@ -7,6 -7,7 +7,7 @@@ etc/ipsec.user.con
  etc/ipsec.user.secrets
  etc/localtime
  etc/shadow
+ etc/snort/snort.conf
  etc/ssh/ssh_config
  etc/ssh/sshd_config
  etc/ssl/openssl.cnf

diff --combined config/rootfiles/oldcore/95/filelists/files
index 28c9e8e09c435a706f36b3f60894bf15302a064e,2c458a14c325b7ae4f575aa1cab4a99c2f489fce..2c458a14c325b7ae4f575aa1cab4a99c2f489fce
--- 1/config/rootfiles/oldcore/95/filelists/files
--- 2/config/rootfiles/core/95/filelists/files
+++ b/config/rootfiles/oldcore/95/filelists/files
@@@ -22,5 -22,6 +22,6 @@@ usr/local/bin/ipsecctr
  usr/local/bin/settime
  usr/local/bin/timecheck
  var/ipfire/backup/exclude
+ var/ipfire/dhcpc/dhcpcd.conf
  var/ipfire/langs
  var/ipfire/network-functions.pl