Renamed cluster_manager_t back to connectivity_cluster_t.
Move back some code that was moved unnecessarily
Use explicit captures instead of '[=]' in lambdas.