Update remaining tests to use http client 5#1

cwperks merged 2 commits intocwperks:apache-client5cwperks/security:apache-client5from

DarshitChanpura:apache-client5DarshitChanpura/security:apache-client5Copy head branch name to clipboard