SAM-2431 merge 315134 from trunk

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

git-svn-id: https://source.sakaiproject.org/svn/sam/branches/sakai-10.x@315344 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAM-2049 merge 308237, 308420, 315155 from trunk

git-svn-id: https://source.sakaiproject.org/svn/sam/branches/sakai-10.x@315345 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAM-2382 merge 313720, 313721 from trunk

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

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

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