SERVER-13922 remove query yielding cruft
Merge remote-tracking branch 'upstream/master'