Change in ovirt-engine[master]: aaa: more fixes to sync and usages