Update Deltaspike to 0.5
Add Weld 2 profile for testing
configure test to have it working for Weld 1 and OWB profiles
extension correction to make veto works on CamelContext descendants
Merge branch 'master' of github.com:apache/camel
Tests Work with Weld 2 now
Merge branch 'master' of https://github.com/antoinesd/camel

Conflicts:
	components/camel-cdi/pom.xml