Merge branch 'findopenmp-lib-paths' into release-3.10

Merge-request: !1385