Fix rmi by ID untagging image on error Upstream-commit: 1e1a3c9508f196f17daec3e47298a86949ab66ec Component: engine