SAM-2176 merge 311222 to 10.x

git-svn-id: https://source.sakaiproject.org/svn/sam/branches/sakai-10.x@311787 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAM-2377 merge 311634 to 10.x

git-svn-id: https://source.sakaiproject.org/svn/sam/branches/sakai-10.x@311788 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAM-2366 merge 311633 to 10.x

git-svn-id: https://source.sakaiproject.org/svn/sam/branches/sakai-10.x@311789 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAM-2276 merge 310728 to 10.x

git-svn-id: https://source.sakaiproject.org/svn/sam/branches/sakai-10.x@311790 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAM-2376 merge 311632 to 10.x

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