Merge changes from topic "unblock-rollback"

* changes:
  Fail blocking staged session when rollback is committed
  Cleanup how we handle abort of active apex session