CLC-4382 - Basic auth not working

https://jira.ets.berkeley.edu/jira/browse/CLC-4382
Merge pull request #3089 from christianv/CLC-4382

CLC-4382 - Basic auth not working