Prepare to include cluster UID in CONTROLLER_IDENTITY to prevent cross-cluster conflicts

Prepare to include cluster UID in CONTROLLER_IDENTITY to prevent cross-cluster conflicts #658