Lots of improvements for proxying internal http requests, including better tests, for #473
Resolving conflicts