HADOOP-10327. Merging change r1565389 from trunk to branch-2.

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