Merge branch 'master' into next

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

diff --cc config/rootfiles/oldcore/201/filelists/sysklogd
index 0000000000000000000000000000000000000000,e166ef2258a7f2e63ace6d7b553add14081113ed..e166ef2258a7f2e63ace6d7b553add14081113ed
mode 000000,120000..120000
--- /dev/null
--- 2/config/rootfiles/core/201/filelists/sysklogd
+++ b/config/rootfiles/oldcore/201/filelists/sysklogd

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