Merge branch 'jetty-update' into jetty-update-pull-request

* jetty-update:
  Fixes for using jetty 9.1.3
  Update jetty to 9.1.3