SAK-25951 merge 308488 to 10.x

git-svn-id: https://source.sakaiproject.org/svn/reference/branches/sakai-10.x@308657 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAM-2318 merge 308322 to 10.x

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