Merging changes r1086461:r1087160 from trunk to federation 



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