Resume building the appropriate patches for relevant 2.2.x -> 2.4.x changes to allow us to apply the 2.4.x already-reviewed HttpProtocolOptions and parser changes.