Strip out everything to do with channel.flow - the server has not sent it since 1.x, and having the shovel worker deal with it by buffering messages is highly dubious anyway.
merge bug25760 into default