[Jaws_Registry]: Added component type field for grouping keys
Applying new changes of Jaws_Registry
Added component type field
[Policy]: Apply new changes of Jaws_Registry