Change in ovirt-engine[master]: core: Remove use of XmlStruct as wrapper of Map