Merge branch 'trac2518'

diff --cc src/bin/auth/auth_srv.cc
Simple merge

diff --cc src/bin/d2/dns_client.cc
Simple merge

diff --cc src/lib/dns/master_loader.cc
Simple merge

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

diff --cc src/lib/dns/python/pydnspp_common.h
Simple merge

diff --cc src/lib/dns/python/rdata_python.cc
Simple merge

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

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