HADOOP-9379. Merging change r1455320 from branch-1.

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