Code Moderator resolve the implementation conflict issue

Merge branch 'Integration_Rel20_SA5_166_YAML' into 'Rel20_CR_TS28.561_Add_Solution_for_Capability_Discovery_of_NDT_in_NDT_Collaboration'

# Conflicts:
#   OpenAPI/TS28561_NdtNrm.yaml