Return a tenant instead of a tenant_id

This patch changes the return type of the add_tenant function.  This
should allow better reuse of the tenant object thorough-out the rest of
the script.

Change-Id: I77051ee4205ae4f9907ddf0a0fe0a3338c53e618