Merge branch 'v9_6' of repo.isc.org:/proj/git/prod/bind9 into v9_6

diff --cc CHANGES
index d223efd1e2736180d81977db7ab368f7c76fb095,4abd32362adb7bd11398928edafd0f4d8c47faa0..1f2d38a07da26e3d8520abfe0ad504fb2ae0e65d
--- 1/CHANGES
--- 2/CHANGES
+++ b/CHANGES
@@@ -1,7 -1,5 +1,9 @@@
 +3298. [bug]           Named could dereference a NULL pointer in
 +                      zmgr_start_xfrin_ifquota if the zone was being removed.
 +                      [RT #28419]
 +
+       --- 9.6-ESV-R6 released ---
+ 
  3297. [bug]           Named could die on a malformed master file. [RT #28467]
  
  3295. [bug]           Adjust isc_time_secondsastimet range check to be more