(cherry picked from commit08f0129732) Conflicts: bin/tests/system/statistics/clean.sh (cherry picked from commitf69f188b90) Conflicts: bin/named/statschannel.c bin/tests/system/statistics/clean.sh bin/tests/system/statistics/ns1/named.conf bin/tests/system/statistics/tests.sh Conflicts: CHANGES