Merge branch 'master' into trac2534

diff --cc src/lib/dns/master_lexer.h
Simple merge

diff --cc src/lib/dns/tests/master_loader_unittest.cc
Simple merge

diff --cc src/lib/dns/tests/rdata_soa_unittest.cc
Simple merge

diff --cc src/lib/dns/tests/rdata_txt_like_unittest.cc
Simple merge