BZ-1075850 - Terminate end event doesn't terminate subprocess
BZ-1065214/BZ-1065213 - EventTypes is not cleaned up after signaling

(cherry picked from commit 15c7480f633be3b7c1062d572fd914f7782ad6a3)