Merge "Fix issues related to checkstyle enforcement for module aaa-authn"