Resolved the last checkstyle issues for release 2.1.