Jira Macro Repair to show Server ID instead of Server Name

Problem Definition

On Jira Macros, Server IDs are unique but Server Name isn't. We can have multiple Jira Server with different Server ID showing up, especially when we are merging different Confluence instances into 1 Confluence Cloud.
Example:

Suggested Solution

Jira Macro Repair screen to show both Server Name AND Server ID instead of only Server Name.

Why this is important

• We couldn't sure which one is the correct one to be fixed with the provided Server Name
• If a wrong one is selected, this could cause Jira Macros to be updated to point to wrong Jira Site
• We need something that is unique to make sure Jira Macro Repair is fixing the correct macros.