Change in simtrace2[master]: Fix missing generation of waiting-time-extension in some situations