HBASE-12283 Clean up some checkstyle errors