Really fix the syntax for the tenant

Documentation now refers to this syntax, which should be the
working one for a (good) while.

Change-Id: I7da2aa27ead11304ea27895e9795d0444b5b2376