convert TenantInfo to BasicTenant
review followup
Merge branch 'restdoc-principals' of https://github.com/sathomas/Hilary into restdoc