Fix public and private "list tenants" calls

Closes-Bug: #1218601

Change-Id: I003cfb519c20d14d7936fe6ef1b7cb4791944943
author: diane fleming
Merge "Fix public and private "list tenants" calls"