SAK-23477 merge trunk r123004

git-svn-id: https://source.sakaiproject.org/svn/calendar/branches/calendar-2.9.x@123592 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-23501 merge trunk r122995

git-svn-id: https://source.sakaiproject.org/svn/calendar/branches/calendar-2.9.x@123594 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-23494 merge trunk r122993

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