Fixing up after merge
Only pass the TenantName if a project is specified

e.g. Rackspace doesn't need it (I think)