Dependency upgrades and fixed OSGi imports

git-svn-id: https://svn.apache.org/repos/asf/camel/trunk@1454292 13f79535-47bb-0310-9956-ffa450edef68