SAK-23117 merge trunk r118267

git-svn-id: https://source.sakaiproject.org/svn/common/branches/common-1.1.x@118627 66ffb92e-73f9-0310-93c1-f5514f145a0a