Fix for NMS-6405 - NPE on SnmpAssetProvisioningAdapter.fetchSnmpAssetString()
Release Notes for Release 1.12.5
Merge branch '1.12' of git://github.com/OpenNMS/opennms into 1.12
1.12.5-SNAPSHOT -> 1.12.5
Partial fix for NMS-6386

The ILR reports wrong data when there are several packages with
different collection rates on collectd-configuration.xml for the same
service.

The partial solution is: move the EJN package from the default
collectd-configuration.xml to the one on the examples directory, because
that package is confusing ILR and it was created only for a very
particular kind of devices.
Merge remote-tracking branch 'origin/1.12'

Conflicts:
	debian/changelog
Fix for NMS-6424 - Exception on node.jsp with storeByForeignSource enabled and no data collection for the node.
Merge remote branch 'origin/1.12' into rc/stable/1.12.5
update docs for extra bugfixes
Fix for NMS-6403 - Security Information disclosed in Service detail screen

Now, for custom monitors like PSM or MTM, if there is an attribute
called password or user-info, its content will be masked with "XXXX".
If there is a parameter where the key attribute contains password or
passwd, the value will be masked with "XXXX".

For standard parameters, if the parameter's key contains the word
password, it won't be displayed.

The solution was verified on a testing environment.
Moved classes that depend on Spring out of core/lib and into a new
core/spring bundle.
Merge remote branch 'origin/1.12' into rc/stable/1.12.5
add NMS-6403 as well
Moved classes in core/spring into a unique package for OSGi cleanliness.
PJSM-163 Refactor JAXB classes to minimal project

* move IPAddress, IPAddressRange, and IPAddressRangeSet objects to core/api, incorporate some if InetAddressUtils
* move the following configuration files' classes to opennms-config-jaxb:
  * collectd-configuration.xml
  * datacollection-config.xml
  * monitoring-locations.xml
  * poller-configuration.xml
  * snmp-config.xml

Squashed commit of the following:

commit b3418647f6e31cfc5d3b53fc1d4d3e770b3c9d18
Merge: a2190b3 60db8f2
Author: Benjamin Reed <ranger@opennms.org>
Date:   Thu Feb 20 12:44:06 2014 -0500

    Merge remote-tracking branch 'origin/master' into jira/PJSM-163

commit a2190b369ccd0fe2386abf6df3c29ee067f20120
Merge: 9964787 302474b
Author: Benjamin Reed <ranger@opennms.org>
Date:   Thu Feb 20 12:11:30 2014 -0500

    Merge remote-tracking branch 'origin/master' into jira/PJSM-163

commit 9964787d81208b26105be13ca790d4ad22471975
Author: Benjamin Reed <ranger@opennms.org>
Date:   Thu Feb 20 10:35:22 2014 -0500

    make RFC5952-compliant strings

commit 53e45e7b9985ce2e9436ec1e6f1885c23c511fbe
Author: Benjamin Reed <ranger@opennms.org>
Date:   Wed Feb 19 21:07:28 2014 -0500

    wrap InetAddress so we do not lose information

commit 7904754bad69e4249bdcd634d28a8b6b1ae23c78
Author: Benjamin Reed <ranger@opennms.org>
Date:   Wed Feb 19 18:14:07 2014 -0500

    some more cleanup and removal of castor bits

commit 29b427fc3bc1797e5a48f8e1d011bb540b904c4f
Author: Benjamin Reed <ranger@opennms.org>
Date:   Wed Feb 19 16:50:12 2014 -0500

    move monitoring locations to opennms-config-jaxb

commit 9a821afeb950b402ced1bdd233a8fb60da1dc2a1
Author: Benjamin Reed <ranger@opennms.org>
Date:   Wed Feb 19 16:32:27 2014 -0500

    move collectd configuration to opennms-config-jaxb

    * move the old IPAddress class to core/api
    * move some of the functionality of InetAddressUtils to the IPAddress class
    * convert collectd package code to not rely on inetaddress APIs from opennms-util

commit be6fe7bb1f0091e14ee39203911a735c86866ce5
Merge: 0c4f325 74a9879
Author: Benjamin Reed <ranger@opennms.org>
Date:   Wed Feb 19 13:22:33 2014 -0500

    Merge remote-tracking branch 'origin/master' into jira/PJSM-163

commit 0c4f3257d246fcdc2a7dd660d673ac232ffc6f0e
Merge: ea9ddad 08b8147
Author: Benjamin Reed <ranger@opennms.org>
Date:   Wed Feb 19 13:19:36 2014 -0500

    Merge remote-tracking branch 'origin/master' into jira/PJSM-163

commit ea9ddad6ae2c3c7bed93ee01237cd0ec820ec29d
Author: Benjamin Reed <ranger@opennms.org>
Date:   Wed Feb 19 12:03:31 2014 -0500

    fix page sequence tests failing

commit 842882ae6fa673e0ba791ed3821e53563b029b97
Author: Benjamin Reed <ranger@opennms.org>
Date:   Tue Feb 18 08:06:30 2014 -0500

    poller and agents moved

commit 02770229db44391e612b1deec38ed3f84e67690c
Author: Benjamin Reed <ranger@opennms.org>
Date:   Fri Feb 14 14:13:13 2014 -0500

    add missing hashcode/equals, fixes OPENNMS-NMS18-UNIT-2

commit a016bb041fbb5c431cc66eced28c76925a25ffdf
Author: Benjamin Reed <ranger@opennms.org>
Date:   Thu Feb 13 18:00:20 2014 -0500

    clean up SystemDefChoice, fix dependency on core.xml

commit 8b3052d1112f44212ed47f344b96bef5a6f1d009
Author: Benjamin Reed <ranger@opennms.org>
Date:   Thu Feb 13 17:45:57 2014 -0500

    make a minimalist opennms-config-jaxb, start refactoring jaxb classes to it
Updated bundle plugin params to make sure that exported packages are
set properly. The opennms-config bundle now loads in Karaf!
Merge branch 'master' of https://github.com/OpenNMS/opennms
Fixing drools-engines.log on log4j.properties
Updated core packages to be OSGi friendly.
Merge branch 'rc/stable/1.12.5' into 1.12