SAK-22718 - svn merge --dry-run -c 117661 trunk

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