Merge branch 'handle_multiple_messages' into 'master'

[ControlModel] Handle conflicting and recurring information

See merge request !160
10 jobs for master in 130 minutes and 26 seconds (queued for 1 second)
Status Name Job ID Coverage
  Unit Test
passed run_unit_tests_on_linux #2666931
linux

00:02:19

23.0%
passed run_unit_tests_on_windows #2666932
windows

00:03:50

23.0%
 
  Integration Test
passed run_scenario_files_on_linux #2666933
linux

01:13:45

passed run_scenario_files_on_windows #2666934
windows

01:10:11

 
  Seed Test
passed run_seed_test_on_linux #2666935
linux

00:45:56

passed run_seed_test_on_windows #2666936
windows

00:48:05

 
  Deploy
manual deploy_branch_on_linux #2666938
linux allowed to fail manual
manual deploy_branch_on_windows #2666940
windows allowed to fail manual
passed deploy_master_on_linux #2666937
linux

00:02:27

passed deploy_master_on_windows #2666939
windows

00:04:41