Merge "Give alreadyrolled error when rollback will be a null edit"