SAK-23099 merge r118088,118090 from trunk

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