Fix web.xml namespaces for servlet version 2.5
Merge branch 'feature/fix-webxml' of github.com:cdlib/openwayback into cdlib-feature/fix-webxml

Conflicts:
	wayback-cdx-server/src/main/webapp/WEB-INF/web.xml