Remove Hadoop dependency on cluster name - index by master UUID like everywhere else