Forward port of issue #15045 to 6.3.x.

Comment From: marcusdacoregio

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