SAK-22846 merge r115334 from trunk

git-svn-id: https://source.sakaiproject.org/svn/portal/branches/portal-2.9.x@118536 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-23007 merge r118049 from trunk

git-svn-id: https://source.sakaiproject.org/svn/portal/branches/portal-2.9.x@118537 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-22149 merge r117560 from trunk

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