Update ClusterMap and HadoopClusterInfo with more useful data access functions
Also, run Eclipse clean code