APF-1411: Upgrade to Spring 4.0 RC2