Merge r1490115 for HADOOP-8957, r1490118 for HADOOP-9131, r1490121 for HADOOP-9526, r1490125 for HADOOP-8982, r1490147 for HADOOP-8958 from branch-2

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