Add branch-2 only commit HDFS-7138 to CHANGES.txt