Fix removing mountpoints on container rm fail Upstream-commit: d4ccd948e9db3ed8d27ec53d738133fd11fec454 Component: engine