[master] Merge branch 'trac2470'
Fixed conflicts: src/lib/dns/master_loader.cc src/lib/dns/tests/master_loader_unittest.cc
src/lib/dns/rrcollator.cc
0 → 100644
src/lib/dns/rrcollator.h
0 → 100644
Fixed conflicts: src/lib/dns/master_loader.cc src/lib/dns/tests/master_loader_unittest.cc