Adding back the change r1097905 for HDFS-1586 that was removed when federation branch for HDFS-1052 was merged into trunk.