fix GEOS-5995-deadlock setting spring to 3.1.4
Merge pull request #309 from ccancellieri/master-GEOS-5995-deadlock

fix GEOS-5995-deadlock setting spring to 3.1.4
Merge branch 'master' of git://github.com/geoserver/geoserver