Merge branch 'YANG-Corrections-Rel18-SA5-165_28.111_28.623_28.541' into...

Merge branch 'YANG-Corrections-Rel18-SA5-165_28.111_28.623_28.541' into 'Integration_Rel18_SA5_165_YANG'

YANG-Corrections-Rel18-SA5-165_28.111-CR0059_28.623_28.541 into Integration

See merge request !2013