revert roadpricing, minimize impact of changes

matsim/src/main/java/org/matsim/core/controler/corelisteners/PlansReplanningImpl.java

@@ -59,7 +59,7 @@ final class PlansReplanningImpl implements PlansReplanning, ReplanningListener {
 
 	@Override
 	public void notifyReplanning(final ReplanningEvent event) {
-		population.getPersons().values().forEach(ReplanningUtils::setInitialPlan);
+		conflictManager.initializeReplanning(population);
 		strategyManager.run(population, event.getIteration(), replanningContextProvider.get());
 		conflictManager.run(population, event.getIteration());
 	}

matsim/src/main/java/org/matsim/core/replanning/conflicts/ConflictManager.java

@@ -41,6 +41,12 @@ public ConflictManager(Set<ConflictResolver> resolvers, ConflictWriter writer, R
 		this.random = random;
 		this.writer = writer;
 	}
+
+	public void initializeReplanning(Population population) {
+		if (resolvers.size() > 0) { // only require if active
+			population.getPersons().values().forEach(ReplanningUtils::setInitialPlan);
+		}
+	}
 
 	public void run(Population population, int iteration) {
 		if (resolvers.size() == 0) {

matsim/src/main/java/org/matsim/core/replanning/conflicts/ConflictModule.java

@@ -49,7 +49,7 @@ ConflictManager provideConflictManager(Set<ConflictResolver> resolvers, Conflict
 					+ ". This will likely cause problems with the conflict logic if you are not sure what you are doing.");
 		}
 
-		Random random = MatsimRandom.getLocalInstance();
+		Random random = MatsimRandom.getRandom(); // no need for local instance, not parallel!
 		return new ConflictManager(resolvers, writer, random);
 	}