Consolidate two classes #7396

Job	Run time
build (matsim)	24s
build (contribs/vsp)	1m 4s
build (contribs/common)	8m 37s
build (contribs/taxi)	50s
build (contribs/minibus)	6m 55s
build (contribs/signals)	4m 43s
build (contribs/bicycle)	2m 5s
build (contribs/cadytsIntegration)	1m 18s
build (contribs/drt)	51s
build (contribs/drt-extensions)	1m 11s
build (contribs/discrete_mode_choice)	1m 47s
build (contribs/carsharing)	3m 1s
build (contribs/commercialTrafficApplications)	54s
build (contribs/av)	1m 2s
build (contribs/locationchoice)	1m 30s
build (contribs/ev)	1m 28s
build (contribs/dvrp)	1m 20s
build (contribs/emissions)	1m 51s
build (contribs/decongestion)	1m 34s
build (contribs/noise)	1m 40s
build (contribs/accidents)	53s
build (contribs/freight)	7m 50s
build (contribs/freightreceiver)	55s
build (contribs/parking)	1m 22s
build (contribs/matrixbasedptrouter)	1m 2s
build (contribs/accessibility)	1m 1s
build (contribs/integration)	1m 3s
build (contribs/multimodal)	1m 36s
build (contribs/protobuf)	1m 8s
build (contribs/shared_mobility)	2m 5s
build (contribs/socnetsim)	1m 8s
build (contribs/sumo)	53s
build (contribs/pseudosimulation)	1m 21s
build (contribs/railsim)	3m 17s
build (contribs/roadpricing)	1m 54s
build (contribs/analysis)	1m 5s
build (contribs/hybridsim)	1m 1s
build (contribs/informed-mode-choice)	4m 57s
build (contribs/otfvis)	53s
build (contribs/osm)	55s
build (contribs/application)	1m 29s
build (contribs/simwrapper)	1m 6s
build (contribs/sbb-extensions)	54s
build (contribs/simulatedannealing)	1m 19s
build (benchmark)	45s
verify-all-jobs-successful (push-or-external-PR)	1s
	1h 25m 58s

Provide feedback