Merge branch 'TS28.541_Rel18_CR_Correct_the_issues_for_NrNrm_YAML_file' into...

Merge branch 'TS28.541_Rel18_CR_Correct_the_issues_for_NrNrm_YAML_file' into 'Integration_Rel18_SA5_152_YAML'

TS28.541 Rel-18 CR1105_ TS 28.541 Correct the issues for NrNrm YAML file

See merge request !840