collapsed _tenant_admin into tenant_admin
collapsed _tenant_admin into tenant_admin

Solinea/goldstone-server,slashk/goldstone-server,slashk/goldstone-server,slashk/goldstone-server,slashk/goldstone-server,slashk/goldstone-server,Solinea/goldstone-server,Solinea/goldstone-server,Solinea/goldstone-server,Solinea/goldstone-server