SAK-20710 merge 310380, 311298 to 10.x

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