Adding new web.xml from 3.4.2

I've merged in the single change: on line 1120,
<url-pattern>/s/*</url-pattern> has been changed to
<url-pattern>/*</url-pattern>