Merge branch 'Integration_Rel16_SA5_152_YANG_Helper' into 'Rel-16'

Integration_Rel16_SA5_152_YANG_Helper into Rel-16

See merge request !961