SERVER-14425 Remove ResourceId string copying in release builds
SERVER-15198 Make scramIterationCount user configurable
SERVER-14425 Fix memory leak in a unit-test and rename
Merge remote-tracking branch 'upstream/master'