SERVER-13635 Undo change to BtreeCursor save/restore

A more complete patch is coming soon
Merge remote-tracking branch 'upstream/master'