HBASE-12315 Fix 0.98 Tests after checkstyle got parented
HBASE-12249 Addendum - fix XML mistake