Forward port of issue #20024 to 2.3.0.M3.

Comment From: wilkinsona

Re-opening so that we can investigate the test failures on Windows: https://ge.spring.io/s/m62r4fmeh6y6k/tests/failed.