HADOOP-10273. Merging r1564639 and r1565454 from branch-2 to branch-2.3

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