Issue #26402: Merge XML-RPC client fix from 3.5