CLEARWATER: CA-107400: Make deletion of VmExtra in xenops VM.remove best-effort