SAK-17441 merge trunk r104749,104750

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