Merge changes If3a6eeb3,I2a29dc60

* changes:
  Factor out code for loading and saving rollback data.
  Store meta data for a rollback in a single file.