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