Change in ovirt-engine[master]: core: Simplify use of generics to avoid cobertura bug