Squashed commit of the following:

commit 3c768737e46abf37fa5ab82edcea085623de231a
Merge: 05ff5c2 4b2e13e
Author: Jeff Gehlbach <jeffg@opennms.org>
Date:   Tue Aug 26 09:35:20 2014 -0400

    Merge branch '1.12' of github.com:OpenNMS/opennms into features/collectable-service-count

commit 05ff5c2c88d077ffe0bbde457d11ae4f65775479
Author: Jeff Gehlbach <jeffg@opennms.org>
Date:   Fri Aug 22 13:27:12 2014 -0400

    Expose via JMX Collectd's collectable service count