Merged branch 'jetty-8'.
Removed test class brought in by mistake during merge.