SAK-23673 merge r125729,125732,127496 from trunk


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


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