SAK-26043 svn merge -c -130580 https://source.sakaiproject.org/svn/osp/trunk

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