reverted accidental check in of local spring-servlet.xml changes