HADOOP-7101. Merge change 1455953 from branch-1

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