Restore checkstyle import control and fix a few violations in the process. Closes gh-14660
Attach a file by drag & drop or click to upload
