[master] Merge branch 'trac1068'

with fixing conflicts in src/lib/datasrc/tests/database_unittest.cc

src/lib/datasrc/tests/Makefile.am

@@ -65,3 +65,4 @@ EXTRA_DIST += testdata/sql1.example.com.signed
 EXTRA_DIST += testdata/sql2.example.com.signed
 EXTRA_DIST += testdata/test-root.sqlite3
 EXTRA_DIST += testdata/test.sqlite3
+EXTRA_DIST += testdata/rwtest.sqlite3

src/lib/datasrc/tests/testdata/Makefile.am

@@ -1 +1,5 @@
 CLEANFILES = *.copied
+BUILT_SOURCES = rwtest.sqlite3.copied
+
+rwtest.sqlite3.copied: $(srcdir)/rwtest.sqlite3
+	cp $(srcdir)/rwtest.sqlite3 $@