Fixes #21114 [1/2]; keystone.user_present fails to create user-roles for more than 1 tenant/user
Fixes #21114 [1/2]; keystone.user_present fails to create user-roles for more
than 1 tenant/user

saltstack/salt,saltstack/salt,saltstack/salt,saltstack/salt,saltstack/salt