Use subscription queue generator fn for topics and reply-queues, too
merge bug26243 into default