Merging change r1078925 into federation from trunk

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