Change in ovirt-engine[master]: core: fixing user types cleanup support