SAM-2169 merge 310343 to 10.x

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

git-svn-id: https://source.sakaiproject.org/svn/sam/branches/sakai-10.x@311095 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAM-1606 merge 309442, 309587 to 10.x

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