After installing the 9 MSI, there are 2 issues

HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\Windows\CurrentVersion\Uninstall\{26A24AE4-039D-4CA4-87B4-2F83219000F0}

-For Enterprise msi only, the DisplayIcon is set to javaws.exe, rather than full path to javaws.exe
-For All msi's the InstallLocation key is empty

This is leading to 3 issues:
   -The new JavaEnvironment code is breaking from DisplayIcon being wrong, and wrongly setting the javapath exe shortcuts
   -The Java cup icon is not showing for the enterprise msi in the add/remove programs
   -The new JavaEnvironment code can't find the InstallLocation, which it prefers over DisplayIcon