Code Modertor address the conflict issue

Merge branch 'Integration_Rel18_SA5_152_YAML' into 'TS28.312_Rel-18_CR_Enhance_the_yaml_dfinition_to_include_the_necessary_description'

# Conflicts:
#   OpenAPI/TS28312_IntentNrm.yaml