Issue Summary

It is not possible to correctly add a global custom field and a project field with the same name to a Jira issues macro.

Steps to Reproduce

• Create a new global custom field with the name "test" and associate it with the screen of the project (AGP in this example)
• Create a new project field with the same name "test"
• Add the project field to a Jira issue (e.g. AGP-1)
• Set a value for the custom field on the Jira issue AGP-1
• In Confluence, add the Jira issue AGP-1 to the (new) Jira issues macro
• Add the field "test" as an additional column to the Jira issues macro

Expected Results

The Jira issues macro will contain the value of the field "test"

Actual Results

The Jira issues macro will NOT contain the column of the field "test".

Workaround

Rename the global custom field or the project field. Different field names should prevent the problem from happening