more spring-security context updates to 3.2