SAK-23350 merge trunk r121699,123127,123142

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