Revert "SERVER-15662 Reenable test that used to fail due to race condition."

This reverts commit a3dd680c584ff19272a6e3b70fd4a308c6e8238a.
Merge remote-tracking branch 'upstream/master'