Upgrade to Spring 4.1.4

Closes gh-2249