SAK-21331 merge trunk 121359

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