0c9666b733
Adapt checkstyle.xml to match the latest version, and remove a line break between imports which trigger a checkstyle volation.