Ensure ScenarioMessage are properly received by Terminator before shutting down, backport #1116