updates to test HTTP basic auth.
Merge branch 'master' into password
Merge branch 'password'