SAK-25731 10.x merge

git-svn-id: https://source.sakaiproject.org/svn/authz/branches/sakai-10.x@306833 66ffb92e-73f9-0310-93c1-f5514f145a0a