Merge branch 'FindPostgreSQL-macports-and-v12' into release-3.16

Merge-request: !3907