Bug #2116: VMFS removes persistent images
(cherry picked from commit e80803829a57c4f2d8a7452b9136d4d35164496f)