SAK-27733 merge 311220 to 10.x

git-svn-id: https://source.sakaiproject.org/svn/reference/branches/sakai-10.x@313705 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-27881 merge 312795 to 10.x

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