SERVER-14471 Fixing lint error because of whitespace
Merge remote-tracking branch 'upstream/master'