This bug was caused by mixing admin commands with tenanted commands.
Now all admin specific commands won't pass the tenant_id when
constructing the url. The non-admin counterparts of these commands are
extracted into separate commands.
Change-Id: I82d75254468ec978da99aa2a612a67e9e39c3f51