HBASE-1502 Aftermath; fix up of broke tests. Fix TestCatalogTracker. Signature changed and mock'd method wasn't triggering