SAK-27591 merge 311167 to 10.x

git-svn-id: https://source.sakaiproject.org/svn/reference/branches/sakai-10.x@311450 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-27582 merge 311142 to 10.x

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