SCHEMA-947. Fix checkstyle violations after CDH 5.0.3. merge.

issue: https://jira.kiji.org/browse/SCHEMA-947
review: https://review.kiji.org/r/2174
over-the-shoulder-reviewers: milo