patch to make join_cluster work on clients