402833 Test harness for global error page and hide exception message from reason string
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
Merge remote-tracking branch 'origin/jetty-8'

Conflicts:
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java