28.541 rel16 cr jan lindblad fix yang mapping problems

I have now backported the fixes to Rel-16 as well and reserved S5-214052/CR-0517. They are now sitting in the branch

• 28.541_Rel16_CR_JanLindblad_Fix_YANG_Mapping_problems which sits on Integration_Rel16_SA5_137_YANG