fix for NMS-5750, dpname should not be null on events and alarms
NMS-5391 fix user rest service security leak
Merge remote-tracking branch 'origin/1.12'

Conflicts:
	core/schema/src/main/liquibase/changelog.xml
	opennms-webapp/src/main/java/org/opennms/web/rest/UserRestService.java