(cherry picked from commit af669cb4fd) Conflicts: bin/named/client.c lib/dns/request.c lib/dns/view.c
af669cb4fd