Merge changes Ie6668cf6,Ib9803b4f

* changes:
  Tweak the lifecycle of rollbacks (2/n)
  Let completeEnableRollback return a boolean (1/n)