SAK-26141 merge 312360, 312439 to 10.x

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