Just to bring in changes and solve conflicts, there was some refactoring
elsewhere.

Conflicts:
	src/lib/datasrc/database.cc
	src/lib/datasrc/datasrc_messages.mes
	src/lib/datasrc/tests/database_unittest.cc