Update Spring to 4.0.5 and 3.2.9