Fixing TestingDir does not implement MethodRule error by removing conflicting junit classes
Merge branch 'jetty-7' into jetty-8