Merge #11593: rpc: work-around an upstream libevent bug