Fix CHANGES.txt to keep it consistent with trunk.