Review cleanups
Make jacoco and checkstyle suppressions use the same format