Fix checkstyle failures on master

The first commit (to checkstyle.xml itself) is just cleanup