multi-tenant: Starting to flesh out entry routing and model.
Merge remote-tracking branch 'origin/multi-tenant' into multi-tenant