SAK-27502 merge 310839, 310845 from trunk

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