(cherry picked from commit ae51b11f78)
ae51b11f78
Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt hadoop-project/pom.xml git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619518 13f79535-47bb-0310-9956-ffa450edef68