HADOOP-9669. Merging change r1524259 from trunk

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