Extends #5794 etc to the SimpleHttpClient so that it also applies to non-federation requests. Fixes #7092.