Merge "use ODL aaa-app-config when AAF disabled"