Stop & Kill options for containers removal Upstream-commit: 319f5516146bd5c9c93907ef612e96d3c3d88711 Component: engine