SAM-1362 merge r125625 from trunk


git-svn-id: https://source.sakaiproject.org/svn/sam/branches/samigo-2.9.x@308468 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAM-2097 merge r121782 from trunk


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