Merge "Skip test_compare_tenant_quotas_with_default_quotas test" into mcp/caracal