HADOOP-7183. svn merge -c 1100056 from trunk



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