merge master and resolve conflicts

5 jobs for useFreeSpaceOnly
Name Stage Failure
failed
run_scenario_files Deploy
Finished scenario file (40.2 s): VadereModelTests/TestOSM/scenarios/rimea_04_flow_osm1_550_up.scenario
###########
# Summary #
###########

Total scenario runs: 116
Passed: 101
Failed: 15
ERROR: Job failed: exit status 1
failed
run_seed_test Deploy
Scenario bridge_timeCost_NAVIGATION with scenario-hash 3648ab10a457eb591d537715445e1743 - OK
###########
# Summary #
###########

Total scenario runs: 7
Passed: 6
Failed: 1
ERROR: Job failed: exit status 1
failed
run_origin_test Deploy
Finished processing dependencies for VadereAnalysisTool==0.1.0
$ python3 Tools/ContinuousIntegration/run_orign_translation_test.py
Traceback (most recent call last):
File "Tools/ContinuousIntegration/run_orign_translation_test.py", line 91, in <module>
output_pairs = get_output_pairs()
File "Tools/ContinuousIntegration/run_orign_translation_test.py", line 66, in get_output_pairs
output_without_offset = [d for d in os.listdir(path) if d.endswith("without_offset")]
FileNotFoundError: [Errno 2] No such file or directory: 'Tools/ContinuousIntegration/run_orign_translation_test.d/output'
ERROR: Job failed: exit status 1