GDA-5917 Upgrade to Spring 4.0.6