Merge branch...

Merge branch 'TS28.541_Rel18_CR1109_Add_energy_saving_attributes_to_IOC_UPFFunction' into 'Integration_Rel18_SA5_152_YAML'

Rel-18 CR1109 28.541 Add energy saving attributes to IOC UPFFunction

See merge request !889