(cherry picked from commit d386eb54)

(cherry picked from commit abb8813a)

Part of change 4728.

(cherry picked from commit 2495de04)

(cherry picked from commit b4c31c87)

(cherry picked from commit f9f3f20d)

4713.	[cleanup]	Minor revisions to RPZ code to reduce
			differences with the development branch. [RT #46037]

(cherry picked from commit 744061a0)

(cherry picked from commit 08151d7f)

4736.	[cleanup]	(a) Added comments to NSEC3-related functions in
			lib/dns/zone.c.  (b) Refactored NSEC3 salt formatting
			code.  (c) Minor tweaks to lock and result handling.
			[RT #46053]

(cherry picked from commit acc3728c)

(cherry picked from commit 2919a6d3)

4734.	[contrib]	Added sample configuration for DNS-over-TLS in
			contrib/dnspriv.

(cherry picked from commit e02abf7e)

(cherry picked from commit fb9712f6)

(cherry picked from commit 6138c5a5)

(cherry picked from commit e2ed24aa)

(cherry picked from commit 98998f3d)

(cherry picked from commit d5707676)

(cherry picked from commit 404c9b1c)

(cherry picked from commit fb088a00)