Updating to Spring 4.0.2, plus other updates to keep integration testing...

... working.