aaa: more fixes to command context propgation

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