SAK-21922 merge r109558 from trunk


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


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


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