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'
Fixed build failure by pushing CollectionResource instances directly onto the stack.
Remove quotes around authenticateUser and authenticatePassword in default
javamail-configuration.properties. They are not needed in properties files.
allow overriding the user and role information in rest tests
test password fuzzing depending on user role
Merge remote-tracking branch 'origin/1.12'

Conflicts:
	core/test-api/rest/src/main/java/org/opennms/core/test/rest/AbstractSpringJerseyRestTestCase.java
	opennms-webapp/src/test/java/org/opennms/web/rest/UserRestServiceTest.java
fix old calls into createRequest()
user should never be null
user should never be null
fix group test
Merge remote-tracking branch 'origin/1.12'
Pulled getParent() into abstract base class.