Upgrade to Spring 4

Tentatively targeting 3.2.0-GA, this is likely to change.