Merge "Fix image deletion checks after unshelve server"