SAK-21088 merge r116823 from trunk

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

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