Change in ovirt-engine[master]: core: undo recent generalization of ovf processing