Merge changes I315e75c3,I23d36950

* changes:
  Commit rollbacks by ID, not by RollbackInfo.
  Stub out API to support rollback of staged installs.