Fix image delete logic

The logic around when to delete an image was just completely wrong.

Also, rackspace sometimes returns a deleted image when we request
it, while hp returns a 404.  Deal with both of those situations.

Change-Id: I4b6d620a750bd39a1d3b89e6eb51baf37694f8a7