SAK-23577 merge trunk r122960

git-svn-id: https://source.sakaiproject.org/svn/profile/branches/profile-2.9.x@127127 66ffb92e-73f9-0310-93c1-f5514f145a0a