HADOOP-10894: Merging r1613201 from branch-2 to branch-2.5.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.5@1613203 13f79535-47bb-0310-9956-ffa450edef68
HDFS-6723. Merge r1613222 from branch-2.

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