tweeks and fixes to get ManualTenantRoutingRestEndpoints working.