Merge "Formatting applied to aaa-authn-keystone bundle"