CA-97023: Preserve VM settings (Optimized for Citrix XenApp)
Merge pull request #965 from siddharthv/CA-97023

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