972146 - use org ID in role name instead of org name

Previously, we used the org's name in the role for better readability (example:
"acme org" instead of "satellite-1"). However, if the org's name changes in
Satellite, we can no longer find the org admin role for the org.

This partially reverts commit 0293d07c1acc173ebd57d3348a6d8b5226535a1b.