Update for jetty9 suitable
Merge remote-tracking branch 'saitara/patch-2'