Not a fix for NMS-5865 but added a missing closing tag. Also, seems I forgot to
git add one file from my last change.
NMS-5281 handle non-ASCII UTF-8 properly (reimplemented)
Merge branch '1.12'

Conflicts:
	opennms-webapp/src/main/webapp/WEB-INF/jsp/alarm/list.jsp