NMS-6649: Documentation-FtpMonitor
added FtpMonitor
Convention fix
Added FtpMonitor service success information
Merge pull request #2 from indigo423/patch-2

Added FtpMonitor service success information
Formated description

Test "Sidebar Block" http://powerman.name/doc/asciidoc#_attributes
Update FtpMonitor.adoc
NMS-6683: Documentation PrTableMonitor

Merge branch 'cyr-doc-PrTableMonitor' of https://github.com/StCyr/opennms into StCyr-cyr-doc-PrTableMonitor

Conflicts:
	opennms-doc/guide-admin/src/asciidoc/index.adoc
Merge branch 'StCyr-cyr-doc-PrTableMonitor' into upstream-dev-docs
Fix for Bug NMS-6757

High CPU usage due to DataCollectionConfigDao.getConfiguredResourceTypes() while Collectd starts.
Updated standalone properties files to match the Karaf version of 2.3.4.
Merge remote-tracking branch 'origin/1.12'

Conflicts:
	opennms-config/src/main/java/org/opennms/netmgt/config/DefaultDataCollectionConfigDao.java
Reordered the contexts to include commonConfigs.xml before proxy-snmp.xml to fix InstanceStrategyIntegrationTest
Updated configs to deviate less from Karaf 2.3.4.
Added some comments to org.apache.karaf.features.cfg.
Fix for Bug NMS-6757 - Part II

It turns out that the current implementation of the
DefaultDataCollectionConfigDao class was not adding the resource types
defined inside the snmp-collection (like the old format of the files),
it was checking only the resource types defined on the
datacolelction-group files.
Merge remote-tracking branch 'origin/1.12'
NMS-6757 - Part II - Fixing compiling issues
Added commonConfigs.xml to fix the tests
initial bridge topology provider