SAK-26633 merge r310811 from trunk


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


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