Merge branch 'Rel20_CR1670_TS28.541_Stage_3_of_Management_Support_for_XRM'...

Merge branch 'Rel20_CR1670_TS28.541_Stage_3_of_Management_Support_for_XRM' into 'Integration_Rel20_SA5_165_YAML'

Rel20_CR1670_TS28.541_Stage_3_of_Management_Support_for_XRM

See merge request !2030