Change in ovirt-engine[master]: core: Update OVF after cold merge