aaa: more sync fixes

Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1120720
Topic: AAA
Change-Id: Ib2611bdc3648525268f4deee8b2ceaa01caca3c1
Signed-off-by: Alon Bar-Lev <alonbl@redhat.com>