SAK-23119 fixing missing r118276 merge in samigo


git-svn-id: https://source.sakaiproject.org/svn/sam/branches/samigo-2.9.x@122987 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-23339 merge r122341 from trunk

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