HTTP client fixes
Updates per Ariel's review
Fix ENG-5918
Merge branch 'master' into ENG-2560-good
Merge pull request #1175 from VoltDB/ENG-2560-good

HTTP client fixes - ENG-2560 and ENG-5438 r=aw