4873.	[doc]		Grammars for named.conf included in the ARM are now
			automatically generated by the configuration parser
			itself.  As a side effect of the work needed to
			separate zone type grammars from each other, this
			also makes checking of zone statements in
			named-checkconf more correct and consistent.
			[RT #36957]

(cherry picked from commit 129c4414)

(cherry picked from commit 4d680094)

(cherry picked from commit 8a4ce201)

(cherry picked from commit 63d0c6a3)

(cherry picked from commit 54c4adef)

                        the ATF tool. [RT #46967]

(cherry picked from commit 23d77c87)

(cherry picked from commit af034ef1)

                        be passed to memmove which is undefined behaviour and
                        can lead to bad optimisation. [RT #46888]

(cherry picked from commit fdd8838b)

4867.	[cleanup]	Normalize rndc on/off commands (validation,
			querylog, serve-stale) so they all accept the
			same synonyms for on/off (yes/no, true/false,
			enable/disable). Thanks to Tony Finch. [RT #47022]

(cherry picked from commit cf8f4241)

4864.	[bug]		named acting as a slave for a catalog zone crashed if
			the latter contained a master definition without an IP
			address. [RT #45999]

(cherry picked from commit ae51a676)

(cherry picked from commit fa22351a)

(cherry picked from commit 69c4c987)

(cherry picked from commit f9613382)

(cherry picked from commit 0c061ce6)