Add tenant id to guest_info file

Fixes bug 1235039

Change-Id: I358fe58bbe343cdf65b18b391196d36d4647b35e