(cherry picked from commit ce0462129f)
ce0462129f
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1563044 13f79535-47bb-0310-9956-ffa450edef68