After CCMA migration 'Create from template' macro is inconsistent in live page compared with edit mode

Issue Summary

If a page contains a template macro, CCMA will migrate this data into the Cloud. The macro button will work correctly on the live page. However, if a user selects Edit and tries to edit the macro, the template name will default to 90-day plan. Without making any changes, if the user were to save while in the edit macro mode, the new template will get saved overriding the true template.

Steps to Reproduce

1. On Confluence Server, create test page
2. Insert 'Create from template' macro. Create Meeting Notes template
3. Publish page
   • Selecting the button on live page will correctly open meeting notes template
4. Use CCMA to migrate Space with test page

Actual Results

In edit mode, selecting to edit the macro shows 90-day plan template
If user were to save at this point, without making any changes, the templates gets updated to 90-day plan.

Expected Results

In edit mode, selecting to edit the macro should show same meeting notes template

Workaround

None