Multi Tenant and Swagger 2 - revisited

Ref: Multi tenant and Swagger 2 - #6 by wlandgraf