Merge change r1524581 from trunk: move HDFS-5122 from Release 2.1.1-beta to Release 2.3.0 in CHANGES.txt