SAM-2296 merge 308357 to 10.x

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

git-svn-id: https://source.sakaiproject.org/svn/sam/branches/sakai-10.x@309206 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAM-2324 merge 308314 308387 308491 to 10.x

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