Try to push as many Jetty 8/9 things down into the JettyContentExchange and CamelHttpClient classes as possible to start trying to get it to support both.
More moving stuff around to make it easier to isolate the Jetty8/9 differences