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

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

YANG-Corrections-Rel20-SA5-165_28.111_28.623_28.541-1683 into Integration

See merge request !2011