aaa: more sync fixes

Change-Id: I3dddcf6b1327f5540e333f7e3d66ef644c40822a
Topic: AAA
Signed-off-by: Yair Zaslavsky <yzaslavs@redhat.com>