[PATCH 06/12] Catalogs and catalog entries adopt new admin_ui