SERVER-14668 Fix compile on some platforms
SERVER-15177 Use native SCRAM-SHA-1 in Enterprise version
Merge remote-tracking branch 'upstream/master'