aaa: Introducing some changes to directory utils

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