Fix for SPC-482
Merge remote-tracking branch 'origin/1.12'

Conflicts:
	features/vaadin-snmp-events-and-metrics/src/main/java/org/opennms/features/vaadin/config/EventAdminApplication.java