More MBean stats: Capsd, JettyServer, etc. And updated collection and graphs for same.
Squashed commit of the following:

commit 301fd2f5fc93986bc0e75398426b839bba971b03
Merge: 74b7fa2 399c31e
Author: Jeff Gehlbach <jeffg@opennms.org>
Date:   Fri Apr 4 10:37:26 2014 -0400

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

commit 74b7fa2732b373632fde9e87cdcf53ecdb46445f
Author: Jeff Gehlbach <jeffg@opennms.org>
Date:   Thu Apr 3 11:05:26 2014 -0400

    Collect and graph some of the new JMX stuff

commit 83a7648678db346c1634a5d0309e4ce0e1e490f8
Author: Jeff Gehlbach <jeffg@opennms.org>
Date:   Thu Apr 3 09:54:48 2014 -0400

    Add some MBean stats for Capsd. It may be on its way out, but it still
    causes problems...

commit 97ab50be844d34179855cc2fbf694743a45a7111
Merge: 87a4abd c04a6f1
Author: Jeff Gehlbach <jeffg@opennms.org>
Date:   Wed Apr 2 10:51:25 2014 -0400

    Merge branch '1.12' into feature-poller-stats-in-mbean

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
Fixed all the hibernate managed entities, to avoid issues with JSON

The following annotation has been added on all entities managed by
hibertane with @XmlRootElement to avoid issues with the ReST API and
JSON:

@JsonIgnoreProperties({"hibernateLazyInitializer", "handler"})

Without that annotation, some exceptions are thrown into the WebUI when
requesting JSON data, for example:

org.codehaus.jackson.map.JsonMappingException: No serializer found for
class org.hibernate.proxy.pojo.javassist.JavassistLazyInitializer and no
properties discovered to create BeanSerializer (to avoid exception,
disable SerializationConfig.Feature.FAIL_ON_EMPTY_BEANS) ) (through
reference chain: org.opennms.netmgt.model.OnmsEvent["nodeId"]->
org.opennms.netmgt.model.OnmsNode_$$_javassist_5["handler"])
Improving JSON representation of OnmsEvent and OnmsMonitoredService
Fix for Bug NMS-6274

Thresholding ignores persistselectorstrategy resulting in threshold
events on items that should be ignored.

Threshold processing is not going to be performed if the output of
CollectionResource.shouldPersist(ServiceParameters) is false.

That way, the same rules defined to decide if a CollectionResource must
be persisted or not, are going to be used to decide if we should apply
or not threshold processing on the resource.
Changed default config for SSH feature to only bind to localhost.
Added DynamicImport-Package to soa bundle so that it can load classes from
anywhere in the OSGi container.
Merge remote-tracking branch 'origin/1.12'

Conflicts:
	opennms-base-assembly/src/main/filtered/etc/snmp-graph.properties
	opennms-services/src/main/java/org/opennms/netmgt/collectd/CollectableService.java
	opennms-services/src/main/java/org/opennms/netmgt/threshd/CollectorThresholdingSet.java
	opennms-services/src/main/java/org/opennms/netmgt/threshd/ThresholdingVisitor.java
Ignore whitespace by default.

Conflicts:
	opennms-config-jaxb/src/test/java/org/opennms/netmgt/config/monitoringLocations/MonitoringLocationsConfigurationTest.java
Added feature definition XML for core OpenNMS bundles to support adding
ActiveMQ sampler listener to the main OpenNMS system. Changed the name of
the core feature artifact to org.opennms.karaf/opennms to match the
convention that Camel and CXF use. Removed the org.opennms.core.* classes
from the Karaf system classpath and added opennms-core feature dependencies
to Vaadin apps that require it.
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.
Added a castor-properties file that provides a castor.properties file that configures
Castor to use the internal copy of Xerces from the JDK instead of an external copy.
This makes Castor more OSGi-friendly and the castor-properties project is an OSGi
fragment bundle for Castor. Also added org.opennms.core.* classes back to the system
classpath for Karaf.
Fixed Maven artifact for OpenNMS features.xml in opennms-full-assembly/pom.xml.
Added sonatype maven repo so that dnsjava can be downloaded for inclusion
in the karaf system folder.
[bamboo] Automated branch merge (from 1.10:3d596d41c142d119e22de4783adb19dac05d65a1)
Upgraded Karaf to version 2.3.4 and upgraded Spring to 3.2.4 to match
Karaf's version.
Fix NMS-6495 RPM and DEB maintainer scripts remove OPENNMS_HOME/data tree
Merge branch '1.12'
Merge branch 'master' into features/TS