Ignore whitespace by default.

Conflicts:
	opennms-config-jaxb/src/test/java/org/opennms/netmgt/config/monitoringLocations/MonitoringLocationsConfigurationTest.java
Changed the ConnectionFactoryNewConnectorImpl to use the default
constructor for the MINA NioSocketConnector. This will recycle the
thread and the IoProcessor for the connector during each connection
which seems to be necessary for MINA to reliably continue to
connect in the face of many connection failures. Fixes bug
NMS-6412.
[bamboo] Automated branch merge (from 1.10:3d596d41c142d119e22de4783adb19dac05d65a1)
Fix NMS-6495 RPM and DEB maintainer scripts remove OPENNMS_HOME/data tree
Fix for Bug NMS-5592

Exception during statsd runs: "Value of line 1 of output from RRD is not
a valid floating point number: '2,670374e+03'" Problem of locale?
Ignore whitespace by default.

Conflicts:
	opennms-config-jaxb/src/test/java/org/opennms/netmgt/config/monitoringLocations/MonitoringLocationsConfigurationTest.java
Changed the ConnectionFactoryNewConnectorImpl to use the default
constructor for the MINA NioSocketConnector. This will recycle the
thread and the IoProcessor for the connector during each connection
which seems to be necessary for MINA to reliably continue to
connect in the face of many connection failures. Fixes bug
NMS-6412.
Fix NMS-6495 RPM and DEB maintainer scripts remove OPENNMS_HOME/data tree
Fix for Bug NMS-5592

Exception during statsd runs: "Value of line 1 of output from RRD is not
a valid floating point number: '2,670374e+03'" Problem of locale?
fix for NMS-5750, dpname should not be null on events and alarms
NMS-5391 fix user rest service security leak
tangentially related to NMS-5391, also don't allow edits for non-admin, non-rest users
add the categories, do not replace them, at merge time
Revert "add the categories, do not replace them, at merge time"

This reverts commit b1ec50f07b0e5f0eda95130db727cd4550e5d54f.
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
user should never be null
Release Notes for Release 1.12.6
1.12.6-SNAPSHOT -> 1.12.6