merging changes from jetty branch