Bug 2893 - Make ClusterIdentifier configurable