Merge "Formatting applied to aaa-authn bundle"