Merge topic 'FindPkgConfig-pkgconf' into release-3.22

90a49647e9 FindPkgConfig: Restore finding pkg-config before pkgconf

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6780