Pickup the HTTP package enhancements from upstream.