SAM-2286 merge 306226 to 10.x

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

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