SAK-26593 merge r310475 from trunk


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


git-svn-id: https://source.sakaiproject.org/svn/dav/branches/sakai-10.x@311259 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-26253 merge r310632 from trunk


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