Updated web.xml to use servlet 3.0 and added a 2.4 compatible web.xml for older test servers (#11688)

Change-Id: Iff9a4b0bbe70832ced7d71e1cfc0855cc0026320