HADOOP-9774. Merging change r1518865 from trunk

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