CLEARWATER: CA-97023: Preserve VM settings (Optimized for Citrix XenApp)