if the Rename during an image delete fails, just delete the original dir

Signed-off-by: Doug Davis <dug@us.ibm.com>
Merge pull request #8165 from duglin/Issue7309

If the Rename during an image delete fails, just delete the original dir  - Issue #7309