401531 StringIndexOutOfBoundsException for "/*" <url-pattern> of <jsp-property-group>
Merge remote-tracking branch 'origin/jetty-7' into jetty-8

Conflicts:
	jetty-webapp/src/main/java/org/eclipse/jetty/webapp/StandardDescriptorProcessor.java
Fixing websocket testcase
Merge branch 'jetty-7' into jetty-8
401531 StringIndexOutOfBoundsException for "/*" <url-pattern> of <jsp-property-group> fix for multiple mappings to *.jsp
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
Merge remote-tracking branch 'origin/jetty-8'

Conflicts:
	jetty-webapp/src/main/java/org/eclipse/jetty/webapp/StandardDescriptorProcessor.java