(cherry picked from commit0439bfedd9) Conflicts: bin/named/server.c bin/tests/system/addzone/tests.sh (cherry picked from commit8134e7662e) Conflicts: CHANGES
(cherry picked from commit0439bfedd9) Conflicts: bin/named/server.c bin/tests/system/addzone/tests.sh (cherry picked from commit8134e7662e) Conflicts: CHANGES