Merge branch 'v9_12' of gitlab.isc.org:isc-projects/bind9 into v9_12

diff --cc CHANGES
index c2a450fe72aefffac0d7f9a6ecb60506dbe7cbeb,5bdff892b2edae6dd4274bc42ca0da10b824701c..111755756a4a0f0b70596432e888c15d14a61065
--- 1/CHANGES
--- 2/CHANGES
+++ b/CHANGES
@@@ -1,7 -1,6 +1,10 @@@
 +4963. [test]          ifconfig.sh now uses "ip" instead of "ifconfig",
 +                      if available, to configure the test interfaces on
 +                      linux.  [GL #302]
 +
+ 4962. [cleanup]       Move 'named -T' processing to its own function.
+                       [GL #316]
+ 
  4958. [bug]           Remove redundant space from NSEC3 record. [GL #281]
  
  4955. [cleanup]       Silence cppcheck warnings in lib/dns/master.c.