Merge "Add IDatabase::getScopedLockAndFlush() method"