NMS-5914 make service type unique
Merge remote-tracking branch 'origin/1.10' into 1.12
Merge remote-tracking branch 'opennms/1.12'

Conflicts:
	opennms-webapp/src/main/java/org/opennms/web/rest/OnmsMonitoredServiceResource.java