CAMEL-7020: Make camel servlet related components deployable on OSGi with servlet 3.0

Conflicts:
	parent/pom.xml

Conflicts:
	parent/pom.xml
include 2.5 for compatibility in CAMEL-7020

Conflicts:
	parent/pom.xml

Conflicts:
	parent/pom.xml
CAMEL-7018: Using custom beans with @ManagedResource shows unavailable standard attributes

Conflicts:
	camel-core/src/main/java/org/apache/camel/component/seda/SedaEndpoint.java

Conflicts:
	camel-core/src/test/java/org/apache/camel/management/ManagedResourceTest.java