Minor code cleanup
Support HDFS federation.