Moved to 2.6.1 (cherry picked from commit fc508b41a90a193f06a0e28ee40862bf9ee0f0c7) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt
Moved to 2.6.1 (cherry picked from commit fc508b41a90a193f06a0e28ee40862bf9ee0f0c7) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt