HADOOP-9217. Merging change 1433713 from trunk

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