Tweak to omit unnecessary import and include all imports in the sort.
Merge branch 'kriegfrj/organise-imports'

Conflicts:
	src/main/java/org/assertj/assertions/generator/BaseAssertionGenerator.java