SAK-22078 merge trunk r124919

git-svn-id: https://source.sakaiproject.org/svn/user/branches/sakai-2.9.x@127132 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-11653 merge trunk r126369

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