SERVER-13423 Rename security.sasl.authenticationMechanisms to security.authenticationMechanisms
SERVER-13422 fix planning bug for elemMatch object index intersection
Merge remote-tracking branch 'upstream/master'