SAK-25295 - missed local merge

git-svn-id: https://source.sakaiproject.org/svn/osp/trunk@130922 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-25325 - missed local merge

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