Issue #18365: 2.7 corrections so tests run
2 files changed