Merge "Fix per-connection database name in DBAccessBase."