Code moderator resolve the implementation conflict issue

Merge branch 'Integration_Rel20_SA5_166_YAML' into 'Rel_20_CR-0377_TS28.312_Enhancement_of_radio_network_performance_assurance_scenarios'

# Conflicts:
#   OpenAPI/TS28312_IntentNrm.yaml