APF-1411: Upgrade to Spring 4