Merge changes Iba026321,I31690e0b,If991c5b7

* changes:
  Make RescueParty not wipe if checkpointing
  Add Checkpoint's abortChanges
  Add needsCheckpoint