Merging changes r1087114:r1087900 from trunk to federation


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