aaa: fixing more context issues

Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1120720
Change-Id: I793344d07b1a60eac50df81ed3fdca04e5a7851a
Topic: AAA
Signed-off-by: Yair Zaslavsky <yzaslavs@redhat.com>