Merge changes from topic "staged_userdata_restore"

* changes:
  Followup cleanup after refactoring rollback states.
  Use a single list for available and committed rollbacks.