Forward port of issue #11347 to 6.0.x.

Comment From: marcusdacoregio

Closed via https://github.com/spring-projects/spring-security/commit/ad2abd39dc80da8de26a8c447d0d96895d1b5bda