Backport of gh-23448

Comment From: smarquard

Here's a patch for 4.x:

https://jira.sakaiproject.org/secure/attachment/56518/VULA-3840-spring.diff

(don't seem to be able to attach a diff directly here).

Comment From: spring-projects-issues

Fixed via 3d2de9a378f164c6d90c647303e4bc31589390d4