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
fix a couple of eclipse warnings
clean SnmpPeerFactory; add ReST range support

* get rid of a bunch of pointless constructors in SnmpPeerFactory
* add FileReloadContainer support to SnmpPeerFactory (auto-reloads snmp-config.xml when it changes)
* add range support to the SnmpConfigRestService updates -- PUTs now support giving an IP range rather than just an IP address
Merge remote-tracking branch 'origin/1.12'

Conflicts:
	core/test-api/snmp/src/main/java/org/opennms/core/test/snmp/ProxySnmpAgentConfigFactory.java
	opennms-base-assembly/src/main/filtered/etc/snmp-graph.properties
	opennms-config/src/main/java/org/opennms/netmgt/config/SnmpPeerFactory.java
	opennms-import/src/test/java/org/opennms/netmgt/importer/operations/UpdateOperationTest.java
	opennms-services/src/main/java/org/opennms/netmgt/collectd/Collectd.java
	opennms-webapp/src/main/java/org/opennms/gwt/web/ui/CoreWeb.gwt.xml
	opennms-webapp/src/main/resources/org/opennms/web/svclayer/applicationContext-svclayer.xml