Make join_cluster idempotent.
Merged bug25648 into stable
Merged stable into default