SAK-22318 merge r109481 from trunk

git-svn-id: https://source.sakaiproject.org/svn/rwiki/branches/sakai-2.9.x@122147 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-13278 merge r120997 from trunk


git-svn-id: https://source.sakaiproject.org/svn/rwiki/branches/sakai-2.9.x@122148 66ffb92e-73f9-0310-93c1-f5514f145a0a