Stick in yet another supervisor to get shutdown happening in the right order.
Make join_cluster idempotent.
merge bug25631 into stable
merge stable into default
Merged bug25648 into stable
Merged stable into default