Merge tag 'v9.21.4'

diff --cc bin/tests/system/resolver/tests.sh
Simple merge

diff --cc lib/dns/qpcache.c
Simple merge

diff --cc lib/dns/qpzone.c
Simple merge

diff --cc lib/dns/resolver.c
Simple merge

diff --cc lib/ns/query.c
Simple merge