make long tenant names look better

Change-Id: Ifd3bb8ba0a7a367e31794c7cc82bef40e2c83d20
Fixes: bug 1057137
Adding extensibility to data_table template file

bug 1098740

Change-Id: I16525165f3e064cb6b9f19cfffb9afa21a3d6f75
Merge "make long tenant names look better"
Merge "Adding extensibility to data_table template file"