Upgrade camel and jetty to current