FindXerces: Synchronise with upstream next branch

No functional changes, just minor cleanup

--no-rebase

--------

Testing:

jobs should remain green