Change in ovirt-engine[master]: core: unify and move Disk Comparators