Upgrading Junit + Hamcrest
Fixing License Header to conform with standard with rest of project
Merge branch 'jetty-7' into jetty-8
414235 - RequestLogHandler configured on a context fails to handle forwarded requests
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
414393 StringIndexOutofBoundsException with > 8k multipart content without CR or LF
Merge remote-tracking branch 'origin/jetty-7' into jetty-8

Conflicts:
	jetty-servlets/src/main/java/org/eclipse/jetty/servlets/MultiPartFilter.java
Merge branch 'jetty-8'

Conflicts:
	jetty-server/src/main/java/org/eclipse/jetty/server/handler/RequestLogHandler.java
	jetty-servlets/src/test/java/org/eclipse/jetty/servlets/MultipartFilterTest.java
	jetty-spdy/spdy-client/pom.xml
	jetty-spdy/spdy-core/pom.xml
	jetty-util/src/main/java/org/eclipse/jetty/util/MultiPartInputStreamParser.java
	jetty-util/src/test/java/org/eclipse/jetty/util/MultiPartInputStreamTest.java
	pom.xml
	tests/test-integration/src/test/java/org/eclipse/jetty/test/monitor/JmxServiceTest.java
	tests/test-integration/src/test/java/org/eclipse/jetty/test/monitor/ProgramConfigTest.java
	tests/test-integration/src/test/java/org/eclipse/jetty/test/monitor/XmlConfigTest.java
Cleanup from merge
414235  RequestLogHandler configured on a context fails to handle forwarded requests
413568 Made AJP worker name generic
413568 Made AJP worker name generic
414507 AnnotationParser should skip classes in hidden dirs or with . name prefix
Merge remote-tracking branch 'origin/jetty-7' into jetty-8

Conflicts:
	jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationParser.java
Merge remote-tracking branch 'origin/jetty-8'

Conflicts:
	jetty-annotations/src/main/java/org/eclipse/jetty/annotations/AnnotationParser.java
	jetty-annotations/src/test/java/org/eclipse/jetty/annotations/TestAnnotationParser.java
414652 - WebSocket's sendMessage() may hang on congested connections.

Fixed by using Locks instead of the synchronized keyword, and by using tryLock()
in flushBuffer() and flush(), that are called by WebSocketConnection.handle().

It is quite a hack, but the real fix is in Jetty 9 where the architecture is different
and there are two different paths for reading and writing, so that this problem
could not even happen.
Merged branch 'jetty-7' into 'jetty-8'.
Merged branch 'jetty-8' into 'master'.
414101 Do not escape special characters in cookies
414625 final static version fields