Merge "Add support for extra database connections in unit tests."