Issue #9516: Merge Distutils changes from 3.2