Restart this branch with a forward-port of 6fe8447a4651 and 9006ab2b1fae, with args to amqp_channel_sup:start_writer() rearranged to be more consistent.
Rearrange and simplify connection startup. It still seems reasonable to keep the concept of the start_infrastructure_fun around, that closure hides quite a lot of state. The other closure can go though.
Merge default
Fix auto-merge error.
merge bug25682 into default