Merge "update to include Jetty8.0 and Jetty8.1"