Merge branch 'trac2907'

diff --cc src/bin/auth/tests/query_unittest.cc
Simple merge

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

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

diff --cc src/lib/datasrc/tests/client_list_unittest.cc
Simple merge