Issue #25764: Merge OS X test skipping from 3.4 into 3.5