Merge branch 'backport-test-FindPkgConfig-isolate-env' into release-3.17

Merge-request: !5108