SAK-19592 merge trunk r122844

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