Issue #28221: Merge SSL test cleanup from 3.5 into 3.6