Use the negotiated frame-max when opening channels
Cosmetic
Strip extraneous comment
Merge bug 25521
stable to default