Issue Summary:

Macros migrated from DC to Forge have their layout incorrectly changed to inline, even if they are declared with block output type on both platforms.

Steps to Reproduce

To reproduce this, you need two equivalent apps that provide the same macro with block output on DC and Forge.

1. On Confluence DC, install the app that provides the macro with block output
2. Add the macro to a page
3. On a Confluence Cloud site, install the equivalent Forge app that provides the same macro, with a matching key and layout: block on the manifest file
4. Migrate the DC contents to Cloud using CCMA

Expected Results

The macro is rendered as in DC, with block layout.

Actual Results

The macro is rendered with inline layout. We can confirm this in the ADF of the macro:

"type": "inlineExtension",

Workaround

1. Edit the page in Cloud and remove the macro from it
2. Add the macro again
3. Reconfigure it if needed