SAM-2047 merge r309739 from trunk


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


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


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