Fix CHANGES.txt to make it consistent with branch-2.