SAK-22918 apply new patch from Juan Jose Merono


git-svn-id: https://source.sakaiproject.org/svn/site-manage/trunk@309451 66ffb92e-73f9-0310-93c1-f5514f145a0a