SERVER-15236 Using SCRAM-SHA-1 for keyfile authentication
Merge remote-tracking branch 'upstream/master'