Merge "Fix test_admin_catalog_list"