Merge changes Id899f3c1,Ib262bc8c

* changes:
  Test child sessions time out in enabling rollback (2/n)
  Rewrite blockRollbackManager (1/n)