Merge r1613318 from trunk: two commenters were confused authnprovideralias providing special config to authz providers