Updated merge from the trunk


git-svn-id: https://svn.apache.org/repos/asf/hadoop/mapreduce/branches/HDFS-641@832892 13f79535-47bb-0310-9956-ffa450edef68
40 files changed