Delete traces of in-progress snapshot on instance being deleted

Catch exception from snapshot process and remove the image being
saved if instance was in fact deleted.

Resolves bug 1143659.

Change-Id: Ibeb87e725819e0b263f26563ae5116e542cb207c