SAK-23406 merge r122197 from trunk

git-svn-id: https://source.sakaiproject.org/svn/content/branches/sakai-2.9.x@127161 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-22891 adding three files missed in r117153 merge from trunk

git-svn-id: https://source.sakaiproject.org/svn/content/branches/sakai-2.9.x@127171 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-23727 merge r125944,r125946 from trunk


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