Resolve installer upgrade issues.

The current install removes the installed products after upgrading
to the new one. With x86<->x64 transitions into the same directory
this can lead to the installer removing files just installed.
Work around that by uninstalling first and then doing the upgrade
install.