CA-97023: Preserve VM settings (Optimized for Citrix XenApp)
Merge pull request #1017 from johnelse/ca-97023-clearwater

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