HADOOP-9381. Merge 1514103 from branch-2

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.1-beta@1514108 13f79535-47bb-0310-9956-ffa450edef68
HDFS-5051. Merge 1514111 from branch-2

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