HKCR\CLSID\CAFEEFAC-0016-0000-0032-ABCDEFFEDCBB\InprocServer32 is set incorrectly

Steps to reproduce:
1. Install 6u32 b03
HKCR\CLSID\{08B0E5C0-4FCB-11CF-AAA5-00401C608501}\TreatAs is {CAFEEFAC-0016-0000-0032-ABCDEFFEDCBB}
HKCR\CLSID\CAFEEFAC-0016-0000-0032-ABCDEFFEDCBB\InprocServer32 is C:\Program Files\Java\jre6\bin\jp2iexp.dll
HKCU\Software\Classes\CLSID\CAFEEFAC-0016-0000-0032-ABCDEFFEDCBB\InprocServer32 is C:\Program Files\Java\jre6\bin\jp2iexp.dll
HKLM\SOFTWARE\Classes\CLSID\CAFEEFAC-0016-0000-0032-ABCDEFFEDCBB\InprocServer32 is C:\Program Files\Java\jre6\bin\jp2iexp.dll

2. Install FX 2.1 b18
HKCR\CLSID\{08B0E5C0-4FCB-11CF-AAA5-00401C608501}\TreatAs is {CAFEEFAC-0016-0000-0032-ABCDEFFEDCBB}
it's ok, see RT-19735

HKCR\CLSID\CAFEEFAC-0016-0000-0032-ABCDEFFEDCBB\InprocServer32 is C:\Program Files\Java\jre6\bin\jp2iexp.dll
Should point to FX?

Keys as for 7 appear, for example:
HKCR\CLSID\CAFEEFAC-0017-0000-0004-ABCDEFFEDCBB\InprocServer32 is C:\Program Files\Oracle\JavaFX 2.1 Runtime\bin\jp2iexp.dll

HKCU\Software\Classes\CLSID\CAFEEFAC-0016-0000-0032-ABCDEFFEDCBB\InprocServer32 is C:\Program Files\Java\jre6\bin\jp2iexp.dll
No keys as for 7 under HKEY_CURRENT_USER (like CAFEEFAC-0017-0000-000X-ABCDEFFEDCBB)

HKLM\SOFTWARE\Classes\CLSID\CAFEEFAC-0016-0000-0032-ABCDEFFEDCBB\InprocServer32 is C:\Program Files\Oracle\JavaFX 2.1 Runtime\bin\jp2iexp.dll
and keys as for 7 appear CAFEEFAC-0017-0000-000X-ABCDEFFEDCBB

3. Run IE with an applet (used http://sqeweb.us.oracle.com/deployment2/jitu/deployregistration/PluginUnderDTTest.html)
Expected: Plug-in 10.4.1.255
Actual: Plug-in 1.6.0_32

IE looks HKCR\CLSID\{08B0E5C0-4FCB-11CF-AAA5-00401C608501}\TreatAs which is {CAFEEFAC-0016-0000-0032-ABCDEFFEDCBB} which is C:\Program Files\Java\jre6\bin\jp2iexp.dll, not FX
See pml log

6u32 b03+FX 2.1 b14 work ok, regression since b15(note RT-19735, 08B0E5C0-4FCB-11CF-AAA5-00401C608501}\TreatAs pointed to CAFEEFAC-0017-0000-0004-ABCDEFFEDCBB in b14)

Can reproduce on stt-96-vmw4.ru.oracle.com and stt-134.ru.oracle.com

No issue with FF and GC