Merge changes I0d3996f1,Ie758cc53

* changes:
  Move enable/snapshot/restore/delete methods to the Rollback class.
  Move state changing methods to the Rollback class.