Merge tag 'v9.21.22'

diff --cc bin/tests/system/xferquota/tests_xferquota.py
Simple merge

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

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

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