rhbz1066701 - Correct Checkstyle violations.