Stick in yet another supervisor to get shutdown happening in the right order.
merge bug25631 into stable
merge stable into default