SAK-28077 merge 315473 from trunk

git-svn-id: https://source.sakaiproject.org/svn/reset-pass/branches/sakai-10.x@315800 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-24398 merge 315479 from trunk

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