Moved v2.0/tokens/tenants back to v2.0/tenants

Closes-Bug: #1293556

Change-Id: I819d726f9e1c9b70c738e71a0a8fce8fba4556aa
author: diane fleming
Merge "Moved v2.0/tokens/tenants back to v2.0/tenants"