Change to return NIC and IpAddress Map from ClusterMap; move HadoopClusterInfo to just DnsName