SAK-22718 merge trunk r117662

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