remove superfluous roles for example
fixed bad merge
409545 Change HttpChannel contract

Ensure HttpParser always calls sequential callbacks by avoiding |=
Merge remote-tracking branch 'origin/master' into servlet-3.1-api