SAK-27756 merge 311493, 311608 to 10.x

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