Merge remote-tracking branch 'upstream/dev-2.x' into upstream-merge-2…

…024-03-04

src/main/java/org/opentripplanner/datastore/OtpDataStore.java

@@ -108,7 +108,7 @@ public void open() {
 
     if (config.stopConsolidation() != null) {
       stopConsolidation =
-        findSourceUsingAllRepos(it -> it.findCompositeSource(config.stopConsolidation(), CONFIG));
+        findSingleSource(config.stopConsolidation(), config.stopConsolidation().toString(), GTFS);
     }
 
     addAll(Arrays.asList(streetGraph, graph, buildReportDir));