HBASE-12665 When aborting, dump metrics
    Add some fixup of checkstyle fails