Make error message consistent when removing containers fail. Upstream-commit: 3c0c115ec89031e0cbd9e739099828342efc872c Component: engine