SAK-20449 merge r120998,r124104 from trunk

git-svn-id: https://source.sakaiproject.org/svn/rwiki/branches/sakai-2.9.x@127747 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-22528 merge r121935,126326 from trunk

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