(cherry picked from commit 0439bfedd9) Conflicts: bin/named/server.c bin/tests/system/addzone/tests.sh
0439bfedd9