Major Description
There are two (or more) versions of leader election: DistributedLeaderElection, DistClusterControllerElection, and possibly others that I'm missing. This isn't good because if there's any code change required, it's very easy to miss doing it everywhere.
In particular, this is causing metrics to not be unregistered on leader election because this was fixed in one place and not the other.