Revert "added some karaf infos to NRTG README"

This reverts commit 7d3e53f0e0cec25228854773e031e0f2b6db6ca8.
Revert "NRTG API mini cleanup"

This reverts commit 73255849daa7f5d6f19ff6976dd57ab96bea13c2.
Revert "NRTG Feature Merge into Master"

This reverts commit e6683c284735c2f369dc3762858abc2555ca5493.

Conflicts:

	features/nrtg/api/src/main/java/org/opennms/nrtg/api/ProtocolCollector.java
	features/nrtg/api/src/main/java/org/opennms/nrtg/api/model/CollectionJob.java
	features/nrtg/api/src/main/java/org/opennms/nrtg/api/model/CollectionTask.java
	features/nrtg/api/src/main/java/org/opennms/nrtg/api/model/DefaultCollectionJob.java
	features/nrtg/api/src/main/java/org/opennms/nrtg/api/model/DefaultMeasurement.java
	features/nrtg/api/src/main/java/org/opennms/nrtg/api/model/DefaultMeasurementSet.java
	features/nrtg/api/src/main/java/org/opennms/nrtg/api/model/LightweightMeasurementSet.java
	features/nrtg/api/src/main/java/org/opennms/nrtg/api/model/Measurement.java
	features/nrtg/api/src/main/java/org/opennms/nrtg/api/model/MeasurementSet.java
	features/nrtg/api/src/test/java/org/opennms/nrtg/api/model/DefaultMeasurementSetTest.java
	features/nrtg/api/src/test/java/org/opennms/nrtg/api/model/LightweightMeasurementSetTest.java
	features/nrtg/commander/src/main/java/org/opennms/nrtg/commander/internal/CollectionCommanderStarter.java
	features/nrtg/commander/src/main/java/org/opennms/nrtg/commander/internal/JmsExceptionListener.java
	features/nrtg/commander/src/main/java/org/opennms/nrtg/commander/internal/JobPublisher.java
	features/nrtg/commander/src/main/java/org/opennms/nrtg/commander/internal/PooledJobPublisher.java
	features/nrtg/commander/src/main/java/org/opennms/nrtg/commander/internal/SimpleJobPublisher.java
	features/nrtg/commander/src/main/java/org/opennms/nrtg/commander/internal/config/AppConfig.java
	features/nrtg/jar/nrtcollector/src/main/java/org/opennms/nrtg/jar/nrtcollector/AppConfig.java
	features/nrtg/jar/nrtcollector/src/main/java/org/opennms/nrtg/jar/nrtcollector/NrtCollectorStarter.java
	features/nrtg/nrtcollector/src/main/java/org/opennms/nrtg/nrtcollector/api/NrtCollector.java
	features/nrtg/nrtcollector/src/main/java/org/opennms/nrtg/nrtcollector/internal/NrtCollectorStarter.java
	features/nrtg/nrtcollector/src/main/java/org/opennms/nrtg/nrtcollector/internal/ProtocolCollectorRegistry.java
	features/nrtg/nrtcollector/src/main/java/org/opennms/nrtg/nrtcollector/internal/ProtocolCollectorRegistryImpl.java
	features/nrtg/nrtcollector/src/main/java/org/opennms/nrtg/nrtcollector/internal/config/AppConfig.java
	features/nrtg/nrtcollector/src/main/java/org/opennms/nrtg/nrtcollector/internal/jms/CollectionJobListener.java
	features/nrtg/nrtcollector/src/main/java/org/opennms/nrtg/nrtcollector/internal/jms/JmsExceptionListener.java
	features/nrtg/nrtcollector/src/main/java/org/opennms/nrtg/nrtcollector/internal/jms/NrtCollectorJMSDLMC.java
	features/nrtg/protocolcollector/snmp/src/main/java/org/opennms/nrtg/protocolcollector/snmp/internal/SnmpChunkProtocolCollector.java
	features/nrtg/protocolcollector/snmp/src/main/java/org/opennms/nrtg/protocolcollector/snmp/internal/SnmpProtocolCollector.java
	features/nrtg/protocolcollector/snmp/src/test/java/org/opennms/nrtg/protocolcollector/snmp/internal/SnmpChunkProtocolCollectorTest.java
	features/nrtg/protocolcollector/snmp/src/test/java/org/opennms/nrtg/protocolcollector/snmp/internal/SnmpProtocolCollectorTest.java
	features/nrtg/web/src/main/java/org/opennms/nrtg/web/internal/JmsExceptionListener.java
	features/nrtg/web/src/main/java/org/opennms/nrtg/web/internal/NrtController.java
	features/nrtg/web/src/main/java/org/opennms/nrtg/web/internal/NrtRrdCommandFormatter.java
	features/nrtg/web/src/main/java/org/opennms/nrtg/web/internal/NrtServlet.java
	features/nrtg/web/src/test/java/org/opennms/nrtg/web/internal/NrtCommandFormatterTest.java
	features/nrtg/web/src/test/java/org/opennms/nrtg/web/internal/TemplateTest.java
	opennms-rrd/opennms-rrd-api/src/main/java/org/opennms/netmgt/rrd/RrdUtils.java
	opennms-services/src/main/java/org/opennms/netmgt/collectd/NumericAttributeType.java
	opennms-services/src/main/java/org/opennms/netmgt/collectd/SnmpAttributeType.java
	opennms-services/src/test/java/org/opennms/netmgt/collectd/SnmpAttributeTest.java
	opennms-services/src/test/java/org/opennms/netmgt/poller/pollables/LatencyStoringServiceMonitorAdaptorTest.java
	opennms-webapp/src/main/java/org/opennms/web/jms/JmsExceptionListener.java
	opennms-webapp/src/main/java/org/opennms/web/svclayer/support/DefaultGraphResultsService.java
	opennms-webapp/src/main/webapp/WEB-INF/jsp/nrt/realtime.jsp
Revert "Revert "NRTG Feature Merge into Master""

This reverts commit d9edb126cb74ed31d0576f9dda196e8dda5705d2.
Revert "Revert "NRTG API mini cleanup""

This reverts commit 5cdc8eac7d48ca4396e5f68bde4f33e99936dab5.
Revert "Revert "added some karaf infos to NRTG README""

This reverts commit fa630484533a2e802dadfe2fef8f4fd0c9e708c8.
Revert "Revert "Revert "added some karaf infos to NRTG README"""

This reverts commit bb79ebf861301c2c63fae266212cc5fdd5b07b45.
Revert "Revert "Revert "NRTG API mini cleanup"""

This reverts commit dcada38de6a1241e11c6fa14464634ad5a77f605.
Revert "Revert "Revert "NRTG Feature Merge into Master"""

This reverts commit 9236bb766f72f92c3a843a36383bbee7bff6484c.