Revert back to the default stop functionality of SIGKILL after timeout Upstream-commit: c3ff1f41bbc03ad8fd6dad6461660ecf6c6ee67d Component: engine