Checkstyle fixes I should have run at the time of the PR
Merge pull request #873 from mkienenb/headless-checkstyle-fixes

Checkstyle fixes I should have run at the time of the PR