Merge branch 'revert-883077ef' into 'master'

simulators/c++2/src_simulator/arch/CPU.cpp

simulators/c++2/src_simulator/arch/FPGA.cpp

simulators/c++2/src_simulator/arch/SchedulableDevice.cpp

simulators/c++2/src_simulator/sim/Simulator.cpp

...ui/interactivesimulation/JFrameInteractiveSimulation.java

...teractivesimulation/JFrameTMLSimulationPanelTimeline.java

...src/test/java/tmltranslator/DiplodocusTerminatedTest.java

ttool/src/test/java/tmltranslator/TimelineDiagramTest.java

...mltranslator/expected/expected_get_generated_timeline.txt

...test/resources/tmltranslator/simulator/terminatedTest.xml