Small logging improvements to SyslogNorthbounder
fix unit test failures from changed convertion behavior
Fix for Bug NMS-6338 - Can't delete an escalation from the WebUI
Merging more self-monitoring MBean enhancements despite some likely gaps in
collection and graphs

Squashed commit of the following:

commit 87a4abd9b3af38ef4b8ddf172ce8cfd9e290fa2f
Merge: 19f3879 0eb29b5
Author: Jeff Gehlbach <jeffg@opennms.org>
Date:   Mon Mar 31 14:09:43 2014 -0400

    Merge branch '1.12' of github.com:OpenNMS/opennms into feature-poller-stats-in-mbean

commit 19f3879ad90c124ad10076f06f578e14fc826285
Author: Jeff Gehlbach <jeffg@opennms.org>
Date:   Mon Mar 24 14:03:25 2014 -0400

    Add JMX stats to Trapd MBean

commit 4ed81954df4769d7a02a4359c53ac53c10e5acad
Author: Jeff Gehlbach <jeffg@opennms.org>
Date:   Mon Mar 24 13:58:17 2014 -0400

    Add JMX stats to Statsd MBean

commit a3255ada9e565c01dc13613756e6f7af276119c6
Author: Jeff Gehlbach <jeffg@opennms.org>
Date:   Mon Mar 24 13:57:55 2014 -0400

    Add JMX stats to JettyServer MBean

commit eff8dce2d144b509ee490a292ae39e43792ae5a3
Merge: 89ed093 6b3b152
Author: Jeff Gehlbach <jeffg@opennms.org>
Date:   Fri Mar 21 15:19:29 2014 -0400

    Merge branch '1.12' of github.com:OpenNMS/opennms into feature-poller-stats-in-mbean

commit 89ed093bef47f462617151ac95692186c5171913
Merge: 2724c53 0db35da
Author: Jeff Gehlbach <jeffg@opennms.org>
Date:   Fri Mar 21 12:04:56 2014 -0400

    Add some JMX attributes on Collectd (thanks to Ron Roskens)
    Also Merge branch '1.12' of github.com:OpenNMS/opennms into feature-poller-stats-in-mbean

commit 2724c53f520bda4588c3aab15458f45018f43b1e
Author: Jeff Gehlbach <jeffg@opennms.org>
Date:   Wed Mar 19 14:56:01 2014 -0400

    Expose PeakPoolThreads and MaxPoolThreads on Pollerd MBean

commit bf74b394e0d97ea145e308efbf48f11dfe9e9554
Merge: 9c129df fa7886f
Author: Jeff Gehlbach <jeffg@opennms.org>
Date:   Wed Mar 19 14:49:55 2014 -0400

    Merge branch '1.12' of github.com:OpenNMS/opennms into feature-poller-stats-in-mbean

commit 9c129df122702261d8d733b729e1ce66d22fa52c
Author: Jeff Gehlbach <jeffg@opennms.org>
Date:   Sun Mar 16 14:50:19 2014 -0500

    Start collecting and graphing the new Pollerd JMX stats

commit 48df9b80070b9c65131c20f4cd615b71fcae451f
Author: Jeff Gehlbach <jeffg@opennms.org>
Date:   Sun Mar 16 12:43:30 2014 -0500

    Add the following attributes to the OpenNMS.Pollerd MBean:

     - ActiveThreads
     - TasksTotal
     - TasksCompleted
     - TaskCompletionRatio
refactor custom client configurer to a separate project
Fixed dependency scope for jcl-over-slf4j.
Fix for Bug NMS-6484

The Valere devices with broken SNMP agents are hanging Provisiond.

A defensive code has been added to abort the walker execution if a valid
PDU (i.e. no errors) with 0 varbinds is returned by the agent, which is
an indication of a broken agent.

The logs are going to show a warning with the following content:

Aborting node scan : Agent failed while scanning the system table: Error
retrieving systemGroup for /X.X.X.X: A PDU with no errors and 0
varbinds was returned from the agent at /X.X.X.X. This seems to be
related with a broken SNMP agent.
Merge remote-tracking branch 'origin/1.10' into 1.12
Merge remote-tracking branch 'origin/1.12'

Conflicts:
	core/snmp/impl-snmp4j/src/main/java/org/opennms/netmgt/snmp/snmp4j/Snmp4JWalker.java
	opennms-alarms/syslog-northbounder/src/main/java/org/opennms/netmgt/alarmd/northbounder/syslog/SyslogNorthbounder.java
	opennms-base-assembly/src/main/filtered/etc/jmx-datacollection-config.xml
	opennms-base-assembly/src/main/filtered/etc/snmp-graph.properties
	opennms-jetty/src/main/java/org/opennms/netmgt/jetty/JettyServer.java
	opennms-services/src/main/java/org/opennms/netmgt/statsd/Statsd.java
	opennms-services/src/main/java/org/opennms/netmgt/trapd/TrapQueueProcessor.java
	opennms-services/src/main/java/org/opennms/netmgt/trapd/Trapd.java
add some logging
Fix for Bug NMS-6489

Upgrade Tools issue: the snmpStorageFlag from datacollection-config.xml
is not being considered while running SnmpInterfaceRrdMigratorOnline.

The filter for selecting the SNMP interfaces where snmpCollect is 'C' or
'UC' was removed in order to consider all kind of scenarios for data
collection, specially when snmpCollectFlag="all".

The solution was tested on a lab using a real DB/RRD from a customer.
Cosmetic enhancement for SnmpInterfaceRrdMigratorOnline

Order the output of the SQL query to obtain the list of candidates of
intefaces to be merged by nodeId and ifDescr (to facilitate debugging).
[bamboo] Automated branch merge (from 1.12:399c31ed31f3e655119a036d917a39b0c9190f90)
Bump minimum PostgreSQL version to 8.4 in RPM and DEB packaging.
Squashed commit of the following:

commit 7ce60d8823e10f471c2864e12fe0c2f2998ede20
Merge: de43273 61249fe
Author: Jeff Gehlbach <jeffg@opennms.org>
Date:   Fri Apr 4 10:41:01 2014 -0400

    Merge branch 'master' of github.com:OpenNMS/opennms into experiment-postgres-min-84

commit de4327372ffaf4c964fcfc7bfaff3f90486b5f77
Merge: ef37d20 4219a10
Author: Jeff Gehlbach <jeffg@opennms.org>
Date:   Tue Apr 1 16:46:56 2014 -0400

    Merge branch 'master' of github.com:OpenNMS/opennms into experiment-postgres-min-84

commit ef37d2099b03e324c94cf37b27b2cdefba25c8c8
Author: Jeff Gehlbach <jeffg@opennms.org>
Date:   Tue Mar 25 14:40:18 2014 -0400

    Bump minimum PostgreSQL version to 8.4 in RPM and DEB packaging
skip XSD generation, include existing generated XSDs in src/main/resources
NMS-6491 fix missing XSDs
Merge remote-tracking branch 'origin/master' into features/TS