SERVER-13336 count should always yield

Revert "SERVER-12554 Lazily yield on count queries."

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