Upgraded to Spring 3.1 to avoid NPE on Tomcat 7

(https://jira.springsource.org/browse/SPR-8496)