Fix finalize_vm calling only when deployment succeeds + cleanup (OMS-349)