Merge changes I3186d27c,I54f28f54

* changes:
  Code cleanup: StagedRollbackTest (2/n)
  Code cleanup: StagedRollbackTest (1/n)