ContainerWait on remove: don't stuck on rm fail Upstream-commit: 220d6c4aff7e3c8887f8c39e8f47b4aca21ab22f Component: engine