Merge branch 'feature-otrs-3.1-integration-2' into jira/NMS-7191

Conflicts:
	opennms-webapp/src/main/webapp/WEB-INF/jsp/alarm/detail.jsp
	pom.xml