Merge branch 'revert-6c6e7300' into 'master'

simulators/c++2/src_simulator/app/TMLDelayCommand.cpp

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

...a/tmltranslator/TMLActivityElementWithIntervalAction.java

src/main/java/tmltranslator/TMLDelay.java

src/main/java/tmltranslator/TMLTextSpecification.java

...va/tmltranslator/tomappingsystemc2/MappedSystemCTask.java

src/main/java/ui/ActivityDiagram2TMLTranslator.java

src/main/java/ui/TGCTimeDelay.java

src/main/java/ui/tmlad/TMLADDelay.java

src/main/java/ui/tmlad/TMLADDelayInterval.java

src/main/java/ui/window/JDialogTimeIntervalUnit.java

src/main/resources/help/activedelay.html

src/main/resources/help/activedelay.md

src/main/resources/help/helpTable.txt

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

.../test/resources/tmltranslator/expected/expected_spec1.tml

.../test/resources/tmltranslator/expected/expected_spec2.tml

.../test/resources/tmltranslator/expected/expected_spec3.tml

.../test/resources/tmltranslator/expected/expected_spec4.tml

...s/tmltranslator/expected/expected_specdelay_readwrite.tml