Adapt to Spring Security 3.1.3
Remove warnings