Merge branch 'YANG_Corrections_Rel20-SA5-163_28.111_28.623_28.541' into...

Merge branch 'YANG_Corrections_Rel20-SA5-163_28.111_28.623_28.541' into 'Integration_Rel20_SA5_163_YANG'

YANG_Corrections_Rel20-SA5-163_28.111_28.623_28.541 into Integration

See merge request !1932