Merge branch 'apache-jsp-osgi' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into apache-jsp-osgi