SAK-20685
Merge fix for SAK-20685 to SAK-22893 branch (used by Michigan for CTools 2.9.0)


git-svn-id: https://source.sakaiproject.org/svn/citations/branches/SAK-22893@118213 66ffb92e-73f9-0310-93c1-f5514f145a0a