Create trusts for admin user with correct tenant name

See the bug description for details.

Closes-Bug: 1318706
Change-Id: Iaed2b9f2ff8964df3d2c5753dcfaf2688046828c
Merge "Create trusts for admin user with correct tenant name"