Cleanup: round1
Layout improvements
More work on checkstyle cleanup spi package
Removed an ANT save file
Fixed import * problems
Merge pull request #2098 from pveentjer/checkstyle-spi

Checkstyle spi