(cherry picked from commitaf669cb4fd) Conflicts: bin/named/client.c lib/dns/request.c lib/dns/view.c (cherry picked from commit374fce8495) Conflicts: bin/named/statschannel.c lib/dns/rbtdb.c lib/dns/request.c lib/dns/resolver.c lib/isc/unix/file.c