Code Moderator resolve the implementation conflict issue

Merge branch 'Integration_Rel20_SA5_166_YAML' into '28.561_Rel20_Add_use_case_and_solution_for_support_methods_for_NDT_reporting'

# Conflicts:
#   OpenAPI/TS28561_NdtNrm.yaml