SAK-27817 merge 312043 from trunk

git-svn-id: https://source.sakaiproject.org/svn/syllabus/branches/sakai-10.x@315277 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-27568 merge 311023, 311709, 311714 from trunk

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