change TenantInfo to BasicTenant
Merge branch 'restdoc-activity' of https://github.com/sathomas/Hilary into restdoc