In case of SUBSCRIBE failure, clean up queues for topic destinations, too
merge bug26238 into stable (take 3)
merge stable into default