Changed how L3AdminTenant id is obtained

Change-Id: Ic57f5bb801d8177c046e577bf36bc71a7ff96c54