SERVER-15539: Properly save/restore state when yielding in M/R

This fixes a regression introduced in commit 29a700ad.