Upgrading Junit + Hamcrest
Fixing License Header to conform with standard with rest of project
Merge branch 'jetty-7' into jetty-8