Backport !1005 onto `testing`

This MR backports Pin to non-external openmpi builds (!1005 - merged) onto testing - that was put onto master first because it was more critical on that branch.