Start of 'upgrading' work where web/WEB-INF/servlet.xml is now a template file in resources/web/servlet.xml.svn. This work is being done to avoid having to hand edit multiple configuration files with the same value (e.g., setting the Google OAuth key)