Fix configuration file jetty.xml
Resolve commit confilict in jetty.xml