Removing an image that fails, also removes the image name/tag.

Fixes #7845 and #7801, and a real pain point I had :)

Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Merge pull request #7963 from jfrazelle/7845-remove-image-fail-dont-untag

Failing to remove an image, will not remove the image name/tag.