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

diff --cc config/rootfiles/oldcore/127/filelists/aarch64/files-aarch64
Simple merge

diff --cc config/rootfiles/oldcore/127/filelists/armv5tel/files-armvtel
index 0000000000000000000000000000000000000000,6a00446f4d9aa67f81ee96edcf4d51c6e17cd3b4..6a00446f4d9aa67f81ee96edcf4d51c6e17cd3b4
mode 000000,100644..100644
--- /dev/null
--- 2/config/rootfiles/core/127/filelists/aarch64/files-aarch64
+++ b/config/rootfiles/oldcore/127/filelists/armv5tel/files-armvtel

diff --cc config/rootfiles/oldcore/127/filelists/bind
index 0000000000000000000000000000000000000000,48a0ebaefd276a9a3db91e9aacf4d7f571b79333..48a0ebaefd276a9a3db91e9aacf4d7f571b79333
mode 000000,120000..120000
--- /dev/null
--- 2/config/rootfiles/core/127/filelists/bind
+++ b/config/rootfiles/oldcore/127/filelists/bind

diff --cc config/rootfiles/oldcore/127/filelists/files
Simple merge

diff --cc config/rootfiles/oldcore/127/update.sh
Simple merge