Here is the cool solution...
https://www.novell.com/communities/c...ch-management/

In regards to the ZCM Agent and upgrades, there is not any need to remove the ZCM agent.
If upgrading from Windows 7, the "User Spoke" of the agent will need to be uninstalled and reinstalled due to differences in how it installs on Win7 vs Win10.
Not an issue on Win10 to Win10 upgrades....