SERVER-13416 Change security.authentication to security.authorization in comment
Merge remote-tracking branch 'upstream/master'