[Bug 17019] HKEY_CURRENT_USER\Software\Classes should be merged into HKEY_CLASSES_ROOT