adding o.w.c.tenant.deployment. other minor changes