HADOOP-7057. svn merge -c 1040849 from trunk


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.22@1040850 13f79535-47bb-0310-9956-ffa450edef68
2 files changed