HBASE-4495 CatalogTracker has an identity crisis; needs to be cut-back in scope (ADDENDUM patch to fix flaky unit test)