SAK-26249 merge 309661 309663 309697 to 10.x

git-svn-id: https://source.sakaiproject.org/svn/syllabus/branches/sakai-10.x@309809 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-26250 merge 309664 309673 309699 309706 to 10.x

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