Change in ovirt-engine[master]: core: Use disk id instead of volume id in OvfUtilsTest