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