Update for bug 381689
Start fixing up for jetty-9. Needs more work.
Mostly done. Needs a little more work.