Merge remote-tracking branch 'origin/core100' into next

diff --cc config/rootfiles/oldcore/100/exclude
index 8e446ce6ca2ee7a1220295d521201dfe0449570a,0000000000000000000000000000000000000000..7ddeae0ba387ee9ad5e6f4f83836b3319d314148
mode 100644,000000..100644
--- 1/config/rootfiles/oldcore/100/exclude
--- /dev/null
+++ b/config/rootfiles/oldcore/100/exclude
@@@ -1,26 -1,0 +1,28 @@@
 +boot/config.txt
++boot/grub/grub.cfg
++boot/grub/grubenv
 +etc/alternatives
 +etc/collectd.custom
 +etc/default/grub
 +etc/ipsec.conf
 +etc/ipsec.secrets
 +etc/ipsec.user.conf
 +etc/ipsec.user.secrets
 +etc/localtime
 +etc/shadow
 +etc/snort/snort.conf
 +etc/ssh/ssh_config
 +etc/ssh/sshd_config
 +etc/ssl/openssl.cnf
 +etc/sudoers
 +etc/sysconfig/firewall.local
 +etc/sysconfig/rc.local
 +etc/udev/rules.d/30-persistent-network.rules
 +srv/web/ipfire/html/proxy.pac
 +var/ipfire/dma
 +var/ipfire/time
 +var/ipfire/ovpn
 +var/lib/alternatives
 +var/log/cache
 +var/state/dhcp/dhcpd.leases
 +var/updatecache