Merge branch 'find_package-prefer-config-not-found' into release-3.15

Merge-request: !3653