Merge branch 'YANG-stage3-Corrections-Rel18-SA5-166' into 'Integration_Rel18_SA5_166_YANG'
YANG-stage3-Corrections-Rel18-SA5-166-28.541-CR1696 into Integration See merge request !2059
YANG-stage3-Corrections-Rel18-SA5-166-28.541-CR1696 into Integration See merge request !2059