Clean up consumers when we hear of the death of a channel or queue.
merge 25600 into stable
merge stable into default