SERVER-13951 First phase of rollback implementation

This reverts commit 64e3b85a7c8a4a6ea7c68f25ae27780c702cdfb5.
Merge remote-tracking branch 'upstream/master'