MB-6972:  new, HTML-only wrapper avoids all the Confluence pain

Change-Id: I69195ad4704c56ca94b269aa853547d2560f2014