Change in ovirt-engine[master]: engine: Add diamond type declaration