[2945]Merge branch 'master' into trac2945

fix merge conflicts

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

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

diff --cc src/bin/dhcp4/ctrl_dhcp4_srv.h
Simple merge

diff --cc src/lib/asiolink/io_address.h
Simple merge

diff --cc src/lib/config/config_data.h
Simple merge

diff --cc src/lib/datasrc/cache_config.h
Simple merge

diff --cc src/lib/datasrc/client_list.h
Simple merge

diff --cc src/lib/datasrc/memory/domaintree.h
Simple merge

diff --cc src/lib/datasrc/memory/rdataset.h
Simple merge

diff --cc src/lib/datasrc/memory/zone_table.h
Simple merge

diff --cc src/lib/datasrc/sqlite3_accessor.cc
Simple merge

diff --cc src/lib/log/interprocess/interprocess_sync_file.h
Simple merge

diff --cc src/lib/log/interprocess/interprocess_sync_null.h
Simple merge