Fix SslBytesServerTest failing on MacOS
405537 NPE in rendering JSP using SPDY and wrapped ServletRequest
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
Merge remote-tracking branch 'origin/jetty-8'

Conflicts:
	jetty-client/src/test/java/org/eclipse/jetty/client/SslBytesServerTest.java
	jetty-servlet/src/main/java/org/eclipse/jetty/servlet/JspPropertyGroupServlet.java
Merge remote-tracking branch 'origin/master' into servlet-3.1-api