Merge "Fix for 7301594 Html.toHtml creating potentially invalid html" into jb-mr1-dev