Fix order in web.xml to pass validation (#11688, #11672)

Change-Id: I84ae6cbded5982da9e9a67b58e9ff9a1617627b8