SERVER-15896 Rename variable to avoid coverity warning from hiding function parameter
Merge remote-tracking branch 'upstream/master'