Use per-consumer prefetch, and thus abandon all those per-subscription channels.
Merge in default
Use the new-old basic.qos, rather than x-prefetch
Merge bug25957