SAK-26331 merge 311243 to 10.x

git-svn-id: https://source.sakaiproject.org/svn/calendar/branches/sakai-10.x@311364 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-27517 merge 310925 to 10.x

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