We have some test failures with 16.0.0, such as:

- test_put_content (unittest_server.ETwistHTTPTC)
- test_base_url (unittest_httptest.TwistedCWAnonTC)
(grafted from 10c12f31d0fe)