[2/3] camel git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/camel

[ffang]

http://git-wip-us.apache.org/repos/asf/camel/blob/0f1d5c75/parent/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/camel/blob/0f1d5c75/platforms/karaf/features/src/main/resources/features.xml
----------------------------------------------------------------------