Refactor HttpClient stream setup

closes #16510 
Ah, yes. Sorry I didn't catch you there.
So I guess we need a new ticket and I add a FIXME?