SERVER-14443 fix lint
Merge remote-tracking branch 'upstream/master'