sync internal and external code.

create the ability to separate the ONAP types creation from the main import

DOD:

1. remove patches created,
2. all code compiles successfully without a profile.
3. all code compiles successfully with catalog profile.
4. import normative works after the change.
5. sanity flow works and successfully executes.
6. automation is successfully executed on the merged code to prevent regression.