Change in ovirt-engine[master]: core: Cleanup DiskDao and its tests