Rollover macro from Content Formatting Macros strips CSS/HTML formatting

Summary

CONF-38578 fix did not include the fixes for Adaptavist Rollover Macro. When using Rollover Macro, custom CSS entered into the page is not honored.

Environment

Atlassian Confluence Cloud 6.0.0-OD

Steps to Reproduce

Create a page with:

1. Custom CSS in a CSS Stylesheet macro
2. An HTML table macro containing a Table Row, and some Table Cells inside Rollover macros:

   HTML Table
   -->Table Row 
   ----> Rollover macro
   ------> Table Cell
   ----> Rollover macro
   ------> Table Cell
   

Expected Results

The custom CSS would be applied, and the table layout would be correct, eg each cell would be placed horizontally in the row:

Actual Results

The CSS is not applied, and the table is not layed out correctly, ie each cell is placed vertically on top of each other, rather than horizontally in the row:

Workaround

Remove the Rollover macro.

NB: This issue will need to be resolved by Adaptavist in their Content Formatting Macros plugin. We are currently working with them to resolve this.