More changes for Jetty 9
Merge branch 'master' of https://github.com/bengalaviz/JettyWTPPlugin