make long tenant names look better

Change-Id: Ifd3bb8ba0a7a367e31794c7cc82bef40e2c83d20
Fixes: bug 1057137
Merge "make long tenant names look better"