Added a waitForElement() so that clicking on the menu bar on the geo
map works more reliably in selenium.
Made OpenNMSSeleniumTestCase more strict by throwing exceptions by default.
bump selenium version, refactor the test base a bit
Fixed ServicePageTest by adding some waitForElement() calls and fixing
links following Font Awesome changes.
bump selenium version
rework the tests a bit

Conflicts:
	smoke-test/src/test/java/org/opennms/smoketest/MenuHeaderTest.java
fix merge error
[bamboo] Automated branch merge (from space/13.2:ba75942c93caa7ee7b78caeb8aea9fcdc4fea260)
convert collectd-configuration.xml and opennms-server.xml to JAXB
Added suppress warning deprecation
Removed misleading comments from code

The comments in LinkdEventProcessor are not very useful
then removing them
Fixed Recursive dependency in Linkd
Removed enable-discovery-download from linkd config

This is no more used
Refactored methids and logs for Linkd scheduling
Fixed MockLinkdConfig

Removed the enablediscoverydownload method
Partial fix for NMS-6345: There are graph templates that are not working with RRDtool
Merge branch 'master' into features/TS
Fixed all Linkd tests

Linkd tests use the right application context
Set to Ignore the caps builder integrated test
Format and indent work area of DiskUsageMonitor before material changes for NMS-6095
Evaluate all disks before declaring everything to be OK (NMS-6095)