SAM-2274 Merge 309578 from trunk

git-svn-id: https://source.sakaiproject.org/svn/sam/branches/sakai-10.x@315352 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAM-2368 Merge 314002 from trunk

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