SAK-23466 merge r122597 from trunk

git-svn-id: https://source.sakaiproject.org/svn/calendar/branches/calendar-2.9.x@127203 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-23467 merge r122599 from trunk

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