Hygiene: Simplify formatter HTML

* Simplifies HTML output to simply wrap content between h2s
* Fixes bug: 48730 and bug: 53802
* No cache flush required

Change-Id: Iafc288e284b07061aba5fcb53bd80cc6e57a6c86
Merge "Hygiene: Simplify formatter HTML"