Merge branch 'FindXMLRPC-no-includes' into release-3.10

Merge-request: !1377