Add a note about Flight Recorder being an Oracle commercial feature
Fix for Bug NMS-6775

Upgrading from 1.8 to 1.12 breaks the scheduled reports generated
through the WebUI.
Merge remote-tracking branch 'origin/1.12'

Conflicts:
	features/reporting/jasper-reports/src/main/java/org/opennms/reporting/jasperreports/svclayer/JasperReportService.java
Fix for Bug NMS-6536 - NRTG is throwing ConcurrentModificationException
Changed runtime-ncs feature to use standard Camel features instead of
importing Camel bundles directly.
Merge branch '1.12'
Moved ISOC IPv6 projects into opennms-tools.
Fixed Rancid Adapter to not stop when doing global resync
Simplified TrapdIpMgr interface.
Added systemDef's for Cisco ASA5585-SSP10, ASA5585-SSP20, ASA5585-SSP40, ASA5585-SSP60, and Cisco Nexus 7009
--petew
Merge pull request #104 from pwieckowski/master

Added systemDef's for Cisco ASA5585-SSP10, ASA5585-SSP20, ASA5585-SSP40,...
Added systemDef's for Cisco ASA5585-SSP10, ASA5585-SSP20, ASA5585-SSP40, ASA5585-SSP60, and Cisco Nexus 7009
--petew
[bamboo] Automated branch merge (from 1.12:54cf46ad218715e3b2422602fead6883e4df141c)
Fix NMS-6788: Large values of snmpifspeed come out negative when used in resource-filter
Merge branch 'master' into mrlambeth-master

Conflicts:
	features/reporting/jasper-reports/src/main/java/org/opennms/reporting/jasperreports/svclayer/JasperReportService.java