SAK-22517 merge r112008,112163 from trunk

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