SAM-2008 merge trunk r115826

git-svn-id: https://source.sakaiproject.org/svn/sam/branches/samigo-2.8.x@118938 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAM-1740 merge trunk r109553

git-svn-id: https://source.sakaiproject.org/svn/sam/branches/samigo-2.8.x@118939 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAM-1729 merge trunk r111939

git-svn-id: https://source.sakaiproject.org/svn/sam/branches/samigo-2.8.x@118940 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAM-1536 merge trunk 102748

git-svn-id: https://source.sakaiproject.org/svn/sam/branches/samigo-2.8.x@118942 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAM-1254 merge trunk r94206

git-svn-id: https://source.sakaiproject.org/svn/sam/branches/samigo-2.8.x@118944 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAM-1259 merge trunk r94401

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