OK it took less time than I thought. All the violations are corrected and pushed, and checkstyle now is being enforced.
Don't forget to use "git --whitespace=fix rebase upstream/master"! Otherwise your merge will be much more difficult than it needs to be.