Change in ovirt-engine[master]: core: Replace FQCNs with imports for comparators