SAK-22390 merge trunk r110643,117749,121886

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