Moved to 2.6.1 (cherry picked from commit 84bf71295a5e52b2a7bb69440a885a25bc75f544) Conflicts: hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
Moved to 2.6.1 (cherry picked from commit 84bf71295a5e52b2a7bb69440a885a25bc75f544) Conflicts: hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt