SAM-2168 merge 315402 from trunk

git-svn-id: https://source.sakaiproject.org/svn/sam/branches/sakai-10.x@315808 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAM-2390 merge 315396 from trunk

git-svn-id: https://source.sakaiproject.org/svn/sam/branches/sakai-10.x@315809 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAM-2389 merge 315398 from trunk

git-svn-id: https://source.sakaiproject.org/svn/sam/branches/sakai-10.x@315810 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAM-2424 merge 314733 from trunk

git-svn-id: https://source.sakaiproject.org/svn/sam/branches/sakai-10.x@315811 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAM-2228 merge 310344 from trunk

git-svn-id: https://source.sakaiproject.org/svn/sam/branches/sakai-10.x@315812 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAM-2350 merge 315297 from trunk

git-svn-id: https://source.sakaiproject.org/svn/sam/branches/sakai-10.x@315813 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAM-2255 merge 315399 from trunk

git-svn-id: https://source.sakaiproject.org/svn/sam/branches/sakai-10.x@315814 66ffb92e-73f9-0310-93c1-f5514f145a0a