fix for NMS-5750, dpname should not be null on events and alarms
NMS-5391 fix user rest service security leak
Cleaned up interfaces inside classes that are visited by the CollectionSetVisitor.
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
Merge branch 'master' of https://github.com/OpenNMS/opennms
tangentially related to NMS-5391, also don't allow edits for non-admin, non-rest users
Merge remote-tracking branch 'origin/1.12'

Conflicts:
	opennms-webapp/src/main/java/org/opennms/web/rest/UserRestService.java
Added AbstractCollectionSet.
add the categories, do not replace them, at merge time
Merge remote-tracking branch 'origin/1.12'
Pulled some duplicate methods into the AbstractCollectionSet superclass.
Pulled more duplicated code into single copy in AbstractCollectionAttribute.
Pulled more duplicate function calls in the AbstractCollectionResource.
Revert "add the categories, do not replace them, at merge time"

This reverts commit b1ec50f07b0e5f0eda95130db727cd4550e5d54f.
Merge remote-tracking branch 'origin/1.12'
Merge remote-tracking branch 'origin/master' into space/14.1