Merge remote-tracking branch 'ms/next-dns-ng' into next

diff --cc config/rootfiles/common/aarch64/stage2
index 2d9a70f81dc75a0e2cd3c09c37bdb19c5018f4b1,167e7096eed617f933a7cb413731eadb80720c5b..f4169a44e9e7636dec3a09d930046e1d0dcd8481
--- 1/config/rootfiles/common/aarch64/stage2
--- 2/config/rootfiles/common/aarch64/stage2
+++ b/config/rootfiles/common/aarch64/stage2
@@@ -91,8 -91,8 +91,9 @@@ usr/lib6
  usr/local/bin/backupiso
  usr/local/bin/connscheduler
  usr/local/bin/consort.sh
+ usr/local/bin/convert-dns-settings
  usr/local/bin/convert-ovpn
 +usr/local/bin/filesystem-cleanup
  usr/local/bin/hddshutdown
  usr/local/bin/ipsec-interfaces
  usr/local/bin/makegraphs

diff --cc config/rootfiles/common/stage2
index b0680914efca37a7b2ab084065bbb742a5c14074,fcdfb41eb5fdae2a2251ae43ed756fc29d5f07d5..fca540431817979a0be47809bd02a68320848a4c
--- 1/config/rootfiles/common/stage2
--- 2/config/rootfiles/common/stage2
+++ b/config/rootfiles/common/stage2
@@@ -90,8 -90,8 +90,9 @@@ usr/lib/libstdc++.so.
  usr/local/bin/backupiso
  usr/local/bin/connscheduler
  usr/local/bin/consort.sh
+ usr/local/bin/convert-dns-settings
  usr/local/bin/convert-ovpn
 +usr/local/bin/filesystem-cleanup
  usr/local/bin/hddshutdown
  usr/local/bin/ipsec-interfaces
  usr/local/bin/makegraphs

diff --cc config/rootfiles/common/x86_64/stage2
index 9d3334e69c3122e8c8fd8d29f1152dd6c5a79e08,6cc918a92edbaf27ec411bbeb77176b70a3959c8..cc67837e5348be1bc455cde3c4581461f779b1b7
--- 1/config/rootfiles/common/x86_64/stage2
--- 2/config/rootfiles/common/x86_64/stage2
+++ b/config/rootfiles/common/x86_64/stage2
@@@ -92,8 -92,8 +92,9 @@@ usr/lib6
  usr/local/bin/backupiso
  usr/local/bin/connscheduler
  usr/local/bin/consort.sh
+ usr/local/bin/convert-dns-settings
  usr/local/bin/convert-ovpn
 +usr/local/bin/filesystem-cleanup
  usr/local/bin/hddshutdown
  usr/local/bin/ipsec-interfaces
  usr/local/bin/makegraphs

diff --cc config/unbound/unbound.conf
Simple merge

diff --cc langs/en/cgi-bin/en.pl
Simple merge