(cherry picked from commit f647c0df9f)
Conflicts:
CHANGES
bin/named/query.c
bin/tests/system/sit/tests.sh
lib/dns/message.c
(cherry picked from commit f647c0df9f)
Conflicts:
CHANGES
bin/named/query.c
bin/tests/system/sit/tests.sh
lib/dns/message.c