Revert --stop/--kill and use SIGKILL instead Upstream-commit: 414ccee23a25df258f9496e721dbfb6f1773ea9a Component: engine