SERVER-7596 SASL client code refactor for SCRAM
SERVER-14668 remove some usages of cc()
Merge remote-tracking branch 'upstream/master'