jetty adapter
Merge remote-tracking branch 'upstream/master'
merge for jetty
Merge pull request #845 from patriot1burke/master

jetty adapter