Fix checkstyle failures on master

The first commit (to checkstyle.xml itself) is just cleanup
I'm not the expert here, but +1 for the current approach excluding the checkstyle.xml file.