Merge branch 'revert-41079fc6' into 'master'

simulators/c++2/src_simulator/app/TMLTask.h

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

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

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

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

simulators/c++2/src_simulator/definitions.h

ttool/src/test/java/tmltranslator/DiplodocusDelayTest.java

ttool/src/test/java/tmltranslator/HTMLParseTest.java

...c/test/java/tmltranslator/RemoveAllTransactionsTests.java

.../tmltranslator/expected/expected_get_all_transactions.txt

...rces/tmltranslator/expected/expected_remove_all_trans.txt

...test/resources/tmltranslator/simulator/parseFPGA_HTML.xml