Finally! This one was big.

With some minor updates to catch up to the changes after merge.

Conflicts:
	src/bin/auth/auth_srv.cc
	src/bin/auth/auth_srv.h
	src/bin/auth/tests/auth_srv_unittest.cc
	src/lib/datasrc/client_list.cc
	src/lib/datasrc/tests/client_list_unittest.cc