APF-1453: Upgraded to Spring 4.1.2