SAM-2274 merge 309578 to 10.x

git-svn-id: https://source.sakaiproject.org/svn/sam/branches/sakai-10.x@311366 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-27543 merge 310944 to 10.x

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