Merge "Fix TextPassDumperDatabaseTest::testPrefetchPlain postgres failures"