Merge branch...

Merge branch 'TS28.541_Rel18_CR1019_NRM_enhancements_for_UpfInfo_and_PcfInfo_and_NetInfo' into 'Integration_Rel18_SA5_151_YAML'

Ts28.541 rel18 cr1019 nrm enhancements for upf info and pcf info and net info

See merge request !757