Missing 1.7.x checkstyle fixes