Http proxy redirect (not following) occasional test failure fix

[dpwspoon]

I've pulled in this related PR into this one (they touch same code and work on very similar issues)