SAK-23693 merge r125709 from trunk

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


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