SAM-1444 merge r110508 from trunk

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

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


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

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

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

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

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