SAK-19592 reverse merge r122844


git-svn-id: https://source.sakaiproject.org/svn/dav/trunk@128413 66ffb92e-73f9-0310-93c1-f5514f145a0a