When an unpublished draft for an image object is removed, a query error causes the image file to be removed as well.

This is actually a reappearance of EZP-20832.

The steps to reproduce are the same, but the environment has to be non clustered.

Steps to reproduce:

• Create image, publish
  • check image on file system
• edit image, navigate away without publishing
• logout / login as different user
• edit image - choose create new draft, publish this one
  • check image on file system
• from edit screen, go to version history.
• delete untouched
  • check image on file system
• return to edit screen and publish without changing anything