Merging changes from r1083902:r1085509 from trunk to federation


git-svn-id: https://svn.apache.org/repos/asf/hadoop/hdfs/branches/HDFS-1052@1089274 13f79535-47bb-0310-9956-ffa450edef68
25 files changed