SAK-22906 merge trunk r118431

git-svn-id: https://source.sakaiproject.org/svn/help/branches/sakai-2.9.x@121837 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-22962 merge trunk r119581

git-svn-id: https://source.sakaiproject.org/svn/help/branches/sakai-2.9.x@121838 66ffb92e-73f9-0310-93c1-f5514f145a0a