Align HTML views with previously existing views.

Add id="msg".
Fix HTML validation issue with h2 inside p.
Merge remote-tracking branch 'upstream/3.5.x' into 3.5.x
Merge pull request #201 from fjollberg/3.5.x

CAS-1261 Align HTML views with previously existing views.