SAK-21798 merge trunk r107507, 112127

git-svn-id: https://source.sakaiproject.org/svn/announcement/branches/sakai-2.8.x@118798 66ffb92e-73f9-0310-93c1-f5514f145a0a