YARN-2022. Fixing CHANGES.txt to be correctly placed. svn merge --ignore-ancestry -c 1607486 ../../trunk/