Merge branch 'next' into temp-c170-development

diff --cc config/rootfiles/oldcore/169/filelists/aarch64/linux-initrd
index 0000000000000000000000000000000000000000,8acdb0f318fd5944ba7866bb416662fc43f61257..8acdb0f318fd5944ba7866bb416662fc43f61257
mode 000000,120000..120000
--- /dev/null
--- 2/config/rootfiles/core/169/filelists/aarch64/linux-initrd
+++ b/config/rootfiles/oldcore/169/filelists/aarch64/linux-initrd

diff --cc config/rootfiles/oldcore/169/filelists/armv6l/linux-initrd
index 0000000000000000000000000000000000000000,4af11bfa1ef693b81c8c6ff97d28da424ce77b02..4af11bfa1ef693b81c8c6ff97d28da424ce77b02
mode 000000,120000..120000
--- /dev/null
--- 2/config/rootfiles/core/169/filelists/armv6l/linux-initrd
+++ b/config/rootfiles/oldcore/169/filelists/armv6l/linux-initrd

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

diff --cc config/rootfiles/oldcore/169/filelists/x86_64/linux-initrd
index 0000000000000000000000000000000000000000,1b9fff70ff1b7694940bb7ee65d8da704a0fd0d2..1b9fff70ff1b7694940bb7ee65d8da704a0fd0d2
mode 000000,120000..120000
--- /dev/null
--- 2/config/rootfiles/core/169/filelists/x86_64/linux-initrd
+++ b/config/rootfiles/oldcore/169/filelists/x86_64/linux-initrd

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