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
Fixed single/multi instance bug in VmwareCollector NMS-5845
Merge branch 'master' of github.com:OpenNMS/opennms
added @override to opennms-services
added all missing @override annotations
removed unused imports
Fix JUnit test for parsing datacollection configuration. The fix for NMS-5845 in commit 19c39d84e4fd38849f49bec5b42b824dac199f6b reduced the amount of resourceTypes by 10.
TLE-9 Topology Object Model, Dao and Service

Added test for two Bridge Forwarding Path
Merge branch 'master' into features/linkd-scalability
Added merge as required by TopologyDao

The method does nothing at the moment