Upgrade to Spring framework 4.1.1

Closes gh-1654