SAM-2408 merge 313932 from trunk

git-svn-id: https://source.sakaiproject.org/svn/reference/branches/sakai-10.x@313934 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-27890 merge 313933 from trunk

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