am 6594eca0: am 9704b563: Merge "Fix for 7301594 Html.toHtml creating...
am 6594eca0: am 9704b563: Merge "Fix for 7301594 Html.toHtml creating potentially invalid html" into jb-mr1-dev
* commit '6594eca0':
Fix for 7301594 Html.toHtml creating potentially invalid html