AETHER-3616 Changes to work with basic auth

Change-Id: Id39dd7365a5e2cde09e9881216bf2d4ec796968e
2 files changed