SERVER-7596 Make SCRAM mechanism code independent db/
Merge remote-tracking branch 'upstream/master'