Merging changes r1086453 and r1086461 from trunk to federation


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