Listen for changes to cluster name.
Merge bug26272
stable to default, plus remove_handler()