Merge branch 'YANG-stage3-Corrections-Rel20-SA5-166' into 'Integration_Rel20_SA5_166_YANG'
YANG-stage3-Corrections-Rel20-SA5-166-28623-cr619-cr0624-28541-cr1695 into Integration See merge request !2061
YANG-stage3-Corrections-Rel20-SA5-166-28623-cr619-cr0624-28541-cr1695 into Integration See merge request !2061