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