Merge branch 'FindHDF5-cleanup' into release-3.14

Merge-request: !2916