SERVER-12595 findAndModify should yield in the same manner as update
Merge remote-tracking branch 'upstream/master'