Fixes #1238
Latest Jetty
Cosmetics
Rollback #1245
Fixes #1245