Merge remote-tracking branch 'origin/master' into deadlock-fixes

tests-extra/functional/data/example.zone

tests-extra/functional/data/flags.zone

tests-extra/functional/functests.py

...-extra/functional/tests/basic/nsec/data/example.zone.nsec

tests-extra/functional/tests/basic/nsec/data/update.sh

tests-extra/functional/tests/basic/nsec/test.py

...xtra/functional/tests/basic/nsec3/data/example.zone.nsec3

tests-extra/functional/tests/basic/nsec3/data/update.sh

tests-extra/functional/tests/basic/nsec3/test.py

tests-extra/functional/tests/basic/query/test.py

tests-extra/functional/tools/dnstest/response.py

tests-extra/functional/tools/dnstest/server.py

tests-extra/functional/tools/zone_sign.sh