Merge branch 'backport-findpostgres-10-and-older' into release-3.15

Merge-request: !4007