🧩 fix: Align Tenant and MCP Configuration Resolution (#14904)