Merge "Make ForeignDBRepo::getDBFactory() actually work on 5.3"