SAK-26593 merge r310475 from trunk


git-svn-id: https://source.sakaiproject.org/svn/dav/branches/sakai-2.9.x@310477 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-26592 merge r310478 from trunk


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