SERVER-15255 fix unit test
Merge remote-tracking branch 'upstream/master'