Upgrade to Spring 4

https://www.pivotaltracker.com/story/show/68802192