git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1354684 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 24c4216bf0d75006fb218d743183f96658bea65c) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1354684 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 24c4216bf0d75006fb218d743183f96658bea65c) Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt