SERVER-13680 Fix failing test
Merge remote-tracking branch 'upstream/master'