Change in ovirt-engine[master]: core: Fix usage to Java 7's diamond generics