HADOOP-9691. Merge 1505042 from branch-2

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.1-beta@1505588 13f79535-47bb-0310-9956-ffa450edef68
HADOOP-9716. Merge 1505052 from branch-2

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.1-beta@1505589 13f79535-47bb-0310-9956-ffa450edef68
HADOOP-9717. Merge 1505053 from branch-2

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2.1-beta@1505590 13f79535-47bb-0310-9956-ffa450edef68
HADOOP-9751. Merge 1505059 from branch-2

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

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