Some more tweaks for detecting SCOTCH.
Merge branch 'garth/fix-scotch-detection' into next