Merge branch 'jk/test-pass-ubsan-options-to-http-test' into maint-2.42