Organise imports and remove some unnecessary semi-colons

Also adds @Override in a few places where IDE did that on save
Mostly complete migration to Spring Security 3 - run tests to find out what remains