Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.admin