HADOOP-10291. Merging r1562353 from trunk to branch-2

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1562355 13f79535-47bb-0310-9956-ffa450edef68
HDFS-5844. Merging -r1562357 from trunk to branch-2

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