fix db_concurrent_test
Merge remote-tracking branch 'hichame/up/master_rc8b'

Conflicts:
	tests/unit/Makefile.am