Migrating from spring 3.2 to spring 4.1