Merge branch 'FindJPEG-revert-turbo' into release-3.20

Merge-request: !6326