Change in ovirt-engine[master]: core: Avoid NPE in OvfReader#buildDisk()