Update tests now that join_cluster is idempotent
Merged bug25648 into stable
stable to default