SAK-26109 merge 309283 to 10.x

git-svn-id: https://source.sakaiproject.org/svn/citations/branches/sakai-10.x@309400 66ffb92e-73f9-0310-93c1-f5514f145a0a