Merge branch 'YANG_Corrections_28.111_28.623_28.541_Rel19-SA5-160' and resolve conflicts