Issue Summary

Unable to edit expand macro in templates.

This is reproducible on Data Center: (yes) / (no)

Steps to Reproduce

1. Step 1 Create a template in conflunce
2. Step 2 Insert expand macro
3. Step 3 Save the changes, and try editing the macro again

Expected Results

Expand macro should be editable.

Actual Results

Expand macro is not editable.

Workaround

Currently there is no known workaround for this behavior. A workaround will be added here when available