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