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