Change in ovirt-engine[master]: core: reduce code duplication in ovf readers