convert collectd-configuration.xml and opennms-server.xml to JAXB
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