Merge branch...

Merge branch 'Rel_18_CR1379_28.541_OpenAPI_SS_Stage_3_for_energy_cost_mapping_rule' into 'Integration_Rel18_SA5_157_YAML'

Rel_18_CR1379_28.541_OpenAPI_SS_Stage_3_for_energy_cost_mapping_rule

See merge request !1416