SERVER-15198: Make scramIterationCount user configurable
Merge remote-tracking branch 'upstream/master'