Refactor HttpClient stream setup

closes #16510 
Yes, Please add FIXMEs with the ticket number #16571