SAK-23027
Merging fix for SAK-23027 to SAK-22893 branch of citations (used by Michigan in CTools 2.9.0)


git-svn-id: https://source.sakaiproject.org/svn/citations/branches/SAK-22893@118203 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-22973
Merging fix for SAK-22973 to SAK-22893 branch (used by Michigan for CTools 2.9.0)


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