Fix issues caused by clashing between macro key and macro alias

There is a check in the Connect app descriptor validator that prevents an app from being installed if there is a clash between a macro key of already installed app with a macro alias of a new app (or vice versa). Initial investigation showed that there is indeed an issue with macro browser that only displays one macro in this case. There doesn't seem to be a good reason for this to be done on purpose as it doesn't cause any issues with the content body where macros a referred by keys.

Therefore macro browser needs to be fixed to handle situations like this and displays both macros.

Additional verification is required to make sure it doesn't cause issues with any other part of Confluence.

See more details in the CONFCLOUD-73785 description and comments.