When doing a merge concurrent with a checkpoint, walk all the way up to a real parent (reverts a recent optimization attempt).