Update to latest Spring Framework 4.0 snapshot changes