SAK-27685 merge 311173 to 10.x

git-svn-id: https://source.sakaiproject.org/svn/search/branches/sakai-10.x@311890 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-27658 merge 311588 to 10.x

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