Make sure plugin container is removed on failure Upstream-commit: 859e43e64c4358c9aa48e045c0e5b048361a4c9b Component: engine