orchestrator-client fails to auth with basic auth and headers

[tomkrouper]

I ran into an issue while testing orchestrator-client where the headers_auth variable's existence caused previous request_auth settings to be ignored. This is an issue to match with the changes I'll be propose in a PR to be filed right after this.