Issue #25583: Merge makedirs fix from 3.4 into 3.5