devmapper cleanup improvements Upstream-commit: bc7424b4434443b036604277bfcdee3fa34a268a Component: engine