HBASE-4825 TestRegionServersMetrics and TestZKLeaderManager are not categorized (small/medium/large); ADDENDUM; PARTIAL REVERT; MISTAKENLY COMMITTED TestCatalogTracker change