Code Moderator resolve the implementation conflict issue

Merge branch 'Integration_Rel20_SA5_166_YAML' into '28.312_Rel20_CR0393_Add_use_case_requirements_and_solution_for_Intent_Guarantee'

# Conflicts:
#   OpenAPI/TS28312_IntentNrm.yaml