MAPREDUCE-233 HDFS-326 sync with SVN_HEAD

git-svn-id: https://svn.apache.org/repos/asf/hadoop/mapreduce/branches/MAPREDUCE-233@885924 13f79535-47bb-0310-9956-ffa450edef68
7 files changed