Add HDFS-7148 to CHANGES.txt, branch-2 only commit.