Merge branch...

Merge branch '28.541_Rel19_CR1337_introduce_NRM_definitions_for_NGRAN_energy_cost_reporting' into 'Integration_Rel19_SA5_156_YANG'

28.541 rel19 cr1337 introduce nrm definitions for ngran energy cost reporting

See merge request !1341