Fix test_authentication_when_tenant_is_disabled

Fixes bug 1099645

Change-Id: I31cbfc8a2b3679d30063e24b7608a70c6b60f979
Fix test_authentication_with_invalid_tenant

Fixes bug 1099644

Change-Id: Ib58b4273054b8b57ef8770365b163f4bd42f93bc
Merge "Fix test_authentication_when_tenant_is_disabled"
Merge "Fix test_authentication_with_invalid_tenant"